From 4ace4333408f7e73c2a2c12997ada7548d76ffc5 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Mon, 16 Sep 2024 14:08:49 +0200
Subject: [PATCH 1/2] - Treballant en el mapa

---
 source/jdraw.cpp        | 11 +++++
 source/jdraw.h          |  1 +
 source/m_editor_map.cpp | 90 +++++++++++++++++++++++++++--------------
 3 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/source/jdraw.cpp b/source/jdraw.cpp
index 27b18b8..54acf7f 100644
--- a/source/jdraw.cpp
+++ b/source/jdraw.cpp
@@ -504,6 +504,17 @@ namespace draw
         sel_color = col;
     }
 
+    void isoline(int x, int y, const int dx, const int dy, const int len)
+    {
+        for (int i=0; i<len; ++i)
+        {
+            pset(destination, x,y, sel_color);
+            x+=dx;
+            pset(destination, x,y, sel_color);
+            x+=dx; y+=dy;
+        }
+    }
+
     void hline(const int x, const int y, const int w)
     {
         for (int i=x;i<x+w;++i) pset(destination, i, y, sel_color);
diff --git a/source/jdraw.h b/source/jdraw.h
index 4402145..dd3dae4 100644
--- a/source/jdraw.h
+++ b/source/jdraw.h
@@ -108,6 +108,7 @@ namespace draw
     void swapcol(const uint8_t c1, const uint8_t c2);
     void restorecol(const uint8_t c);
     void color(const uint8_t col);
+    void isoline(int x, int y, const int dx, const int dy, const int len);
     void hline(const int x, const int y, const int w);
     void vline(const int x, const int y, const int h);
     void fillrect(const int x, const int y, const int w, const int h);
diff --git a/source/m_editor_map.cpp b/source/m_editor_map.cpp
index 0a7fd4f..780cc9c 100644
--- a/source/m_editor_map.cpp
+++ b/source/m_editor_map.cpp
@@ -11,7 +11,7 @@ namespace modules
     {
         draw::surface *surf;
         vec2_t scroll {0,0};
-        bool drawn[64];
+        int drawn[64];
         int current_room;
 
         struct miniroom_t
@@ -23,6 +23,49 @@ namespace modules
         };
         miniroom_t minirooms[64];
 
+        void drawLines(const int room, const int x, const int y)
+        {
+            if (drawn[room]) return;
+            drawn[room] = true;
+            if ( (x>=-32) && (x<520) && (y>=-16) && (y<240) )
+            {
+                draw::color(RED);
+                if (minirooms[room].exits[XN] != 255) { draw::isoline(x,y,-1,-1,14); draw::isoline(x,y-1,-1,-1,14); draw::isoline(x,y+1,-1,-1,14); }
+                if (minirooms[room].exits[YN] != 255) { draw::isoline(x,y,+1,-1,14); draw::isoline(x,y-1,+1,-1,14); draw::isoline(x,y+1,+1,-1,14); }
+                if (minirooms[room].exits[XP] != 255) { draw::isoline(x,y,+1,+1,14); draw::isoline(x,y-1,+1,+1,14); draw::isoline(x,y+1,+1,+1,14); }
+                if (minirooms[room].exits[YP] != 255) { draw::isoline(x,y,-1,+1,14); draw::isoline(x,y-1,-1,+1,14); draw::isoline(x,y+1,-1,+1,14); }
+            }
+            if (minirooms[room].exits[XN] != 255) drawLines(minirooms[room].exits[XN], x-24, y-12);
+            if (minirooms[room].exits[XP] != 255) drawLines(minirooms[room].exits[XP], x+24, y+12);
+            if (minirooms[room].exits[YN] != 255) drawLines(minirooms[room].exits[YN], x+24, y-12);
+            if (minirooms[room].exits[YP] != 255) drawLines(minirooms[room].exits[YP], x-24, y+12);
+        }
+
+        void drawRoom(const int room, const int x, const int y)
+        {
+            if (drawn[room]) return;
+            drawn[room] = true;
+            if ( (x>=-32) && (x<520) && (y>=-16) && (y<240) )
+            {
+                draw::stencil::set(room);
+                draw::swapcol(1, minirooms[room].color);
+                draw::draw(x-16, y-8, 32, 16, minirooms[room].w*32, minirooms[room].h*16);
+                
+                //draw::swapcol(1, RED);
+                //if (minirooms[room].exits[XN] != 255) draw::draw(x-4-(minirooms[room].w*2), y-5-(minirooms[room].w),4,5,0,64);
+                //if (minirooms[room].exits[YN] != 255) draw::draw(x+(minirooms[room].h*2), y-5-(minirooms[room].h),4,5,3,64);
+                //if (minirooms[room].exits[XP] != 255) draw::draw(x+(minirooms[room].w*2), y-3+(minirooms[room].w),4,5,0,64);
+                //if (minirooms[room].exits[YP] != 255) draw::draw(x-4-(minirooms[room].h*2), y-3+(minirooms[room].h),4,5,3,64);
+
+                char num[] = "00"; num[0] = 48+(room/10); num[1] = 48+(room%10);
+                draw::print(num, x-4, y-3, LIGHT+(room==current_room?YELLOW:WHITE), BLACK);
+            }
+            if (minirooms[room].exits[XN] != 255) drawRoom(minirooms[room].exits[XN], x-24, y-12);
+            if (minirooms[room].exits[XP] != 255) drawRoom(minirooms[room].exits[XP], x+24, y+12);
+            if (minirooms[room].exits[YN] != 255) drawRoom(minirooms[room].exits[YN], x+24, y-12);
+            if (minirooms[room].exits[YP] != 255) drawRoom(minirooms[room].exits[YP], x-24, y+12);
+        }
+
         void loadMiniRoom()
         {
             const int room = room::getCurrent();
@@ -53,45 +96,32 @@ namespace modules
             current_room = room::getCurrent();
             loadMiniRoom();
             room::load(current_room);
+
+            for (int i=0;i<64;++i) drawn[i]=false;
+            draw::cls(2);
+            draw::setSource(surf);
+
+            drawLines(room::getCurrent(), scroll.x, scroll.y);
+
+            draw::swapcol(1, RED);
+            for (int y=-1; y<=1; ++y)
+                for (int x=-1; x<=1; ++x)
+                {
+                    for (int i=0;i<64;++i) drawn[i]=false;
+                    drawRoom(room::getCurrent(), scroll.x+x, scroll.y+y);
+                }
+
         }
 
-        void drawRoom(const int room, const int x, const int y)
-        {
-            if (drawn[room]) return;
-            drawn[room] = true;
-            if ( (x>=-32) && (x<520) && (y>=-16) && (y<240) )
-            {
-                draw::stencil::set(room);
-                draw::swapcol(1, minirooms[room].color);
-                draw::draw(x-16, y-8, 32, 16, minirooms[room].w*32, minirooms[room].h*16);
-
-                draw::swapcol(1, RED);
-                if (minirooms[room].exits[XN] != 255) draw::draw(x-4-(minirooms[room].w*2), y-5-(minirooms[room].w),4,5,0,64);
-                if (minirooms[room].exits[YN] != 255) draw::draw(x+(minirooms[room].h*2), y-5-(minirooms[room].h),4,5,3,64);
-                if (minirooms[room].exits[XP] != 255) draw::draw(x+(minirooms[room].w*2), y-3+(minirooms[room].w),4,5,0,64);
-                if (minirooms[room].exits[YP] != 255) draw::draw(x-4-(minirooms[room].h*2), y-3+(minirooms[room].h),4,5,3,64);
-
-                char num[] = "00"; num[0] = 48+(room/10); num[1] = 48+(room%10);
-                draw::print(num, x-4, y-3, LIGHT+(room==current_room?YELLOW:WHITE), BLACK);
-            }
-            if (minirooms[room].exits[XN] != 255) drawRoom(minirooms[room].exits[XN], x-24, y-12);
-            if (minirooms[room].exits[XP] != 255) drawRoom(minirooms[room].exits[XP], x+24, y+12);
-            if (minirooms[room].exits[YN] != 255) drawRoom(minirooms[room].exits[YN], x+24, y-12);
-            if (minirooms[room].exits[YP] != 255) drawRoom(minirooms[room].exits[YP], x-24, y+12);
-        }
 
         bool loop()
         {
-            for (int i=0;i<64;++i) drawn[i]=false;
-
             if (input::keyPressed(SDL_SCANCODE_ESCAPE) || input::keyPressed(SDL_SCANCODE_TAB)) return false;
 
-            draw::cls(2);
-            draw::setSource(surf);
-
             draw::stencil::enable();
             draw::stencil::clear(255);
 
+            for (int i=0;i<64;++i) drawn[i]=false;
             drawRoom(room::getCurrent(), scroll.x, scroll.y);
             draw::render();
 

From 87d7b4ce4674b80d855f6338cc639a74a3ce4929 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Tue, 17 Sep 2024 13:54:32 +0200
Subject: [PATCH 2/2] =?UTF-8?q?-=20El=20minimapa=20es=20pinta=20millor=20-?=
 =?UTF-8?q?=20M=C3=A9s=20gr=C3=A0fics=20de=20caixes=20i=20pareds=20-=20M?=
 =?UTF-8?q?=C3=A9s=20habitacions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/caixes.gif         | Bin 4283 -> 4551 bytes
 data/rooms/08.txt       | 142 ++++++++++++------------
 data/rooms/09.txt       |  39 +++++++
 data/rooms/10.txt       |  11 ++
 data/rooms/11.txt       |   9 ++
 data/rooms/12.txt       |  13 +++
 data/rooms/13.txt       | 232 ++++++++++++++++++++++++++++++++++++++++
 data/rooms/14.txt       |  11 ++
 data/rooms/15.txt       |  13 +++
 data/rooms/16.txt       |   9 ++
 data/rooms/17.txt       |   9 ++
 data/rooms/18.txt       |   8 ++
 data/walls.gif          | Bin 1886 -> 1905 bytes
 source/m_editor_map.cpp |  36 +++----
 14 files changed, 442 insertions(+), 90 deletions(-)
 create mode 100644 data/rooms/09.txt
 create mode 100644 data/rooms/10.txt
 create mode 100644 data/rooms/11.txt
 create mode 100644 data/rooms/12.txt
 create mode 100644 data/rooms/13.txt
 create mode 100644 data/rooms/14.txt
 create mode 100644 data/rooms/15.txt
 create mode 100644 data/rooms/16.txt
 create mode 100644 data/rooms/17.txt
 create mode 100644 data/rooms/18.txt

diff --git a/data/caixes.gif b/data/caixes.gif
index 200413a8f1c392efcf9519200f85e0991fa4ac6f..c3c3084b7ab8e17fab8742a69ef1035b400fb49f 100644
GIT binary patch
delta 1276
zcmV<Y1OxlKA;%-I+zfx`mUsu3y+BjqlrDr91E@BclKGkCvTb2!P+a4cuEm*N1p}Wc
znlqqaKUSGCAZ(v`FI-e|ui|P{baKY@0<HO*Bj=mI>6&vloCbEA<i-STr<<DzFVCn%
zZ)cpp$pX?Do1pnsIaZyvS(hqjSs^uPlGRJkNmn9JoyLg*wF!Tl+1Z-CWS+HInk#l<
z1eJ2G#R<ImbnWGy(wUz=2Au1OYGS9K|Gya^;K`h;QJ)AZ85;6*#vz~%nriy_pS1a)
z?|CK3d7*q1p9abXGD4rmF`*Pnnji|H)(M-brUfB7Y+-Ss_X!3QmY{giY7ANq{h6Y0
zW}_s!a1<(Rc2$2wrwOAzs-ZGsHu9M#SSFxccBI+4YVVm{ix#1f7H&k;qOL}9zWAc9
z*qt_Tqa!+;2zH}KTBD>1rr*}3C;Fv5%38h{YfbrJ9cm{McPiB-U&dK)-1cZ@Dxy)!
zW%bsYbpTuyMl4#IUV<v5fl8z)2WKJXr3|K?i&~-|$E1HcdSFZ1ZAu4ZJ}EP)>1i9d
zp|sYi^r>her)pygY)(3=N=j^`3S$5ChN7k#TDj&%$yrr@RFTmZtL)*SI6!k~T5}Ee
zpFLKlTK1*s*{j|btd;2uE=V56S6M$QPRE6F-@%`z_NSz}bmggVbLy&CMy;yKt#lTg
z#%E*kxjKJBlAPu$8{{Exb(UpxMrY{RuJrY;N*Awa%5Xg<u1FPsr%7Arvzq(*gw1IJ
zk-BgpMxFH5bs~qbri!X0Hap#6lh}uw1?ND%;&HKgtk;RKJ4USf%CXyObE@}cCgUF^
zOBpnfbhMeWa;9`2E1Z{_WA$WFh&QksXS1wXb1#1@16}v9K+v<;YAlY~mRU)c{JFD8
zx3NE~v_zLRjQO<HxSdbCF3Kda|BrDVM}r-pSDKwLp;FsQ{6us%fp%6&G-+^|ieRQ+
z+YVoNKO;j&eLysma5QUc26;McrzB(aVvjteoUB*2Mya)TaJLmYQg5R<{<jg(6fWC`
zw(oy)288RMTzdx11(r0JP<VH6R9lTer#3=$1(7SAb;}$l%QEYuE>YBgX@Pc|Ye4T*
z1)=MnqidCw;;-nH6>fvIBr}58a}{zsxn2QsDcZV!lP335xpVV5K+{hwAy;t=D0Zu}
z4(e^aD~fa*ib!Zxs5>OomJ01SBiGA#8bg1l=E=DIginskxrbYUO!i`XRFo*>w!kaD
zVP|SCE4h&hx2;9Lr^ttC_gMe%OKs`fPmYpto4cpdd#0+oxa2yzfY`sG(T0BXwQ9)~
zK{N*9A+HInvD{{LGI_mv)4xsx6Yha0rxbQ1k#N=OFZM=M5%UfpydCxUU-@LY#{_@4
z4-9qMT4zhzs9tA4nmfPK_%g`kX$9rI<~VgcI;SG{s*1{$<2ArJtcmEjNc4onG+Y8T
zdZ!r+ZVKjkMiRq;NW^`K!)}!%TNYy1%ELtCNBld+&GDCj#HEwUt9ATa*K1WsQHya5
zwHdr<OKholidt=Vm3&MQeyqaU3aoSxO0Tj&j(wcSP8_a0?68k~$m@{E*@~<o`>V3a
zNfe=fnmlj72CgoP2Z(WfM1EPjo++>Rx?qpAk=h5CW}LGPi@->W$~v@qWh})r*To*2
mw_s$nS3I-;pt3SMEi)9EnrzD;_e-hK%tP?Wzw|C400281Qg_Y(

delta 1006
zcmV<K0}=ekBfBB6+zfwrOmsn0;*>6g7Xzp^nUdL=wlry8=~|lURWQ(*pg98y_G6WK
zN}`#WhUaQjbaKY@0;qYLBWIhqnVRjeVv^N%vI(2@@{CIKcDsq2EO4AO=b4M(o52}U
zuX&m9LY#CZ0?MhJDA1X!=3}VoLDBi06M15;#R;_ebnSJW=y`vh+<BWh)}6&b9>KX9
z<2j#_p&?Ia9O#*!$Jw6B$)CA-1zaPZ|Fv=@;2EG!m2&i{1j44DyD49|*`5%Jn)i}N
zQb(Qn^k4#t7p-=m<*=R%nrf^0q3rpe6iRWvXgb6KpE6=L843|t#-LpGq7mw$#Rj0F
zLvAV>JI*<uH`;%q9olgDiC}QnW6Q~&S|$sub)t~clo*PjYgm!KXav>epbe@8*|lg3
z`k+=CT1e_gcy)5=m7+UZVeDa_NdRXd)}Rcwnx+P#G)HGZ)}>Ejpkw7}8yKH7d8Y`f
zXd$O++eU1D3S#y)Z@>mzXTU!Ww4}E6M^Gv(h>D|@1pt3<s%75RWBzHWJ0_&u)|vqN
zJU^F4$7NZuW_+d7qUvdCbug$TN~r%+x}{j=ouz~vSQ$5Ffo=p-Tp98m*;!{<2B%85
ztD4GiL`n?A=OaajeduGFNM$4}mYnp~bt31ih1#dsbrC3ctin)oHj}8rnF5n4q)X><
ztXZkdX{~>hW0RieA10%&swrnmN1~_ct_vEPzEV#Xg?QZ>uMQdnT}NWdgs!jRm~A-(
zoXW4|>JsENp^V9xGP$sKd9ROg9!G;6pci%y3zU(`J!61&R!KBzfOi+$l1rIV8*4y)
zKs1wZGzuHC$f|wwQ?gc9n-S{;10z5z+p^b3g6e+)P2sYAAd7YuOROu~oNptCegzU4
z6<Z_=bZR412)izrx2{X0j_MLc{|%THK>M@(^iI|aEms*9l|ozSH8^e~u_QBs*mD&q
z8?-_Tv-tX5_tRYP_BlY)Pb?u<CkrUC5Vl*$wnU{LTAQ>*J6u*(wL?N}snCuyqOyKl
zvG;#M5=2)zYP+`j<u#tPUH$WWP`j){n^Bg8cj^$iRjZ7ai-6a&N@ja&o$I;b)SN~6
zU-#6M`EWmaQ@W@7Sg#9eZD5&N3$Rz)u#{`Nh(Uujf+v1SmtNRpjSGmAMG>$|Rswso
zE;hM5<c7_GOrCbLb2(mt+qasCj*FzdS?OjO^fHYvBfg2`N3=^30fWAYWEak2zSrx%
zVgz_!%f9DJzyCEY^6R|%t6VtzOOEsVzg#OV06~h;OTci1kn5+wmdREw>%ilLk*g=c
c(^P?lXu*9qLm8{V8=OlX+?Nmw03iSXJLeSa;s5{u

diff --git a/data/rooms/08.txt b/data/rooms/08.txt
index d29918c..a62982f 100644
--- a/data/rooms/08.txt
+++ b/data/rooms/08.txt
@@ -1,73 +1,15 @@
 width: 0
 height: 3
+door-height-yp: 0
 door-height-yn: 5
 color: CYAN
 floor-texture: 6
 wall-texture: 0
 door-texture: 0
 under-door-texture: 0
+exit-yp: 9
 exit-yn: 7
 
-actor{
-    name: BOX
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 8 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX07
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 16 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX04
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 16 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX09
-    bmp: caixes.gif
-    bmp-rect: 128 128 32 32
-    bmp-offset: 0 32
-    pos: 24 24 0
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: BOX08
-    bmp: caixes.gif
-    bmp-rect: 128 128 32 32
-    bmp-offset: 0 32
-    pos: 32 24 0
-    size: 8 8 4
-    movement: CW
-}
-
 actor{
     name: BOX01
     bmp: caixes.gif
@@ -78,16 +20,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX02
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 0 8
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: BOX06
     bmp: caixes.gif
@@ -98,6 +30,36 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 32 0 0
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX02
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 32 0 8
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX03
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 32 8 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX05
     bmp: caixes.gif
@@ -107,3 +69,43 @@ actor{
     size: 8 8 4
     movement: CW
 }
+
+actor{
+    name: BOX07
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 24 16 0
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX09
+    bmp: caixes.gif
+    bmp-rect: 128 128 32 32
+    bmp-offset: 0 32
+    pos: 24 24 0
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: BOX04
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 32 16 0
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX08
+    bmp: caixes.gif
+    bmp-rect: 128 128 32 32
+    bmp-offset: 0 32
+    pos: 32 24 0
+    size: 8 8 4
+    movement: CW
+}
diff --git a/data/rooms/09.txt b/data/rooms/09.txt
new file mode 100644
index 0000000..0eb59dc
--- /dev/null
+++ b/data/rooms/09.txt
@@ -0,0 +1,39 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-xn: 0
+door-height-yp: 0
+door-height-yn: 0
+color: WHITE
+floor-texture: 0
+wall-texture: 7
+door-texture: 2
+under-door-texture: 0
+exit-xp: 12
+exit-xn: 10
+exit-yp: 17
+exit-yn: 8
+
+actor{
+    name: NEVERA1
+    bmp: caixes.gif
+    bmp-rect: 0 96 32 32
+    bmp-offset: 2 33
+    pos: 8 8 0
+    size: 8 8 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: NEVERA2
+    bmp: caixes.gif
+    bmp-rect: 32 96 32 32
+    bmp-offset: 2 33
+    pos: 8 8 8
+    size: 8 8 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
diff --git a/data/rooms/10.txt b/data/rooms/10.txt
new file mode 100644
index 0000000..cb33220
--- /dev/null
+++ b/data/rooms/10.txt
@@ -0,0 +1,11 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-yn: 0
+color: PURPLE
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xp: 9
+exit-yn: 11
diff --git a/data/rooms/11.txt b/data/rooms/11.txt
new file mode 100644
index 0000000..dc20fee
--- /dev/null
+++ b/data/rooms/11.txt
@@ -0,0 +1,9 @@
+width: 2
+height: 2
+door-height-yp: 0
+color: YELLOW
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-yp: 10
diff --git a/data/rooms/12.txt b/data/rooms/12.txt
new file mode 100644
index 0000000..891a54d
--- /dev/null
+++ b/data/rooms/12.txt
@@ -0,0 +1,13 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-xn: 0
+door-height-yn: 0
+color: GREEN
+floor-texture: 3
+wall-texture: 3
+door-texture: 1
+under-door-texture: 3
+exit-xp: 13
+exit-xn: 9
+exit-yn: 15
diff --git a/data/rooms/13.txt b/data/rooms/13.txt
new file mode 100644
index 0000000..d0d9d71
--- /dev/null
+++ b/data/rooms/13.txt
@@ -0,0 +1,232 @@
+width: 2
+height: 2
+door-height-xn: 1
+door-height-yn: 1
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xn: 12
+exit-yn: 14
+exit-zn: 18
+
+actor{
+    name: LIFT18
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 8 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT17
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 16 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT19
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 16 8 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT31
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 16 16 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT20
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 24 8 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT32
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 24 16 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT21
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 32 8 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT33
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 32 16 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT22
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 40 8 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT34
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 40 16 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT23
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 48 8 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT35
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 48 16 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT16
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 24 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT30
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 16 24 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT13
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 32 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT29
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 16 32 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT14
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 40 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT28
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 16 40 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT15
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 48 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT27
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 16 48 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
diff --git a/data/rooms/14.txt b/data/rooms/14.txt
new file mode 100644
index 0000000..58ae2d4
--- /dev/null
+++ b/data/rooms/14.txt
@@ -0,0 +1,11 @@
+width: 2
+height: 2
+door-height-xn: 0
+door-height-yp: 0
+color: WHITE
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xn: 15
+exit-yp: 13
diff --git a/data/rooms/15.txt b/data/rooms/15.txt
new file mode 100644
index 0000000..b3f83f0
--- /dev/null
+++ b/data/rooms/15.txt
@@ -0,0 +1,13 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-yp: 0
+door-height-yn: 0
+color: YELLOW
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xp: 14
+exit-yp: 12
+exit-yn: 16
diff --git a/data/rooms/16.txt b/data/rooms/16.txt
new file mode 100644
index 0000000..1763138
--- /dev/null
+++ b/data/rooms/16.txt
@@ -0,0 +1,9 @@
+width: 2
+height: 2
+door-height-yp: 0
+color: PURPLE
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-yp: 15
diff --git a/data/rooms/17.txt b/data/rooms/17.txt
new file mode 100644
index 0000000..d9b5389
--- /dev/null
+++ b/data/rooms/17.txt
@@ -0,0 +1,9 @@
+width: 2
+height: 2
+door-height-yn: 0
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-yn: 9
diff --git a/data/rooms/18.txt b/data/rooms/18.txt
new file mode 100644
index 0000000..ec60e56
--- /dev/null
+++ b/data/rooms/18.txt
@@ -0,0 +1,8 @@
+width: 2
+height: 2
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-zp: 13
diff --git a/data/walls.gif b/data/walls.gif
index 08be7a541921980fa5f3585e5c86289d5c29d303..cb549606b656fc3a51483242900879d253518a01 100644
GIT binary patch
delta 1843
zcmV-32h8~14)G3<Q-5n)og1yeZgU2#ERm!c4`t!uCM?hK0wD^Qj+0F|r2umaY42(U
z1|{3-MGDROLPoUlY~~`hPB2N_@UmC%rjf3&yW4Yd3`1mWJau<^YFliKUr}&;04!mG
z3x0QCkzspFn17UBbc9+<NtbDIr!RV5QFc3!n_`ZNh?sb@Yk!oXEuXHFpH-xJzHzop
zhl46}esQ&HEwfq-j=jFWjnjppwSCz@oUla1ktM6a=+&v;r_HeEjMwqoHqegW;MMh|
zdp+Iae$8{nj~g~+m+~D;wc}p6A%QTFnYhUrxNHTvb!#>d|KrA8;|fY+_W%R3bS5Ff
zd#BP`xq22a3V+MkFwZ}gGMhBCxZ|a{We7{QJ4i0#LzX&g0p!KBkf@vzX?7x{r=!fB
z8;ikQhRz+yQ2C5T8!OhI)Rj<0(d4!3X3w;NvX)Ew6BW7=C+CEXJJu!Jhf8a|JqkCj
z$c|W{-i#PnYu%yiKypp_6ernME!V~@O!u(cxtu#q^nclQXUe;+P<yScvo%Mxi7EbN
z%~|uckAsE1o-Np%MtONpV_Qv_?_l6Qr){picC^3C;N)6UUQC%}RH^YYbUDuGy~d&)
zhE86Qs_5th!$bFN?o05pH`@gaH~qWpm&*&=cKsKcK&t;%mDW^sAf=>GAMuq0V0zuX
zGayz@6@RDSS@cZ>oo=nYB~MSi6`~Mw3JeCBg8zKS(}qkXmmgf3g;$Dy|Ivq7Kgt0`
zP7m@O#hq(q@yOv^fvuQUi|3j5(SOrfSYAc@aG~9kxm~7Vl=YowQ<N9xwBK_jYKd7$
z0y;(pSHO*UAc+LA^`k?+nZ;&k%~d7kXaUa07=L*sq6VdzlZaQDQ$NC!Rhwur*J6Lq
zSte1Ioxwy>aD4J-6>@yRMv;pqB6ZQBM;-~0r->CPBR|7QQ<R>k`MI7_vAwvSqFUN!
zQ&kaSY21m8GHDk!k)~2%ajdqK;hKrEW~)F_^<t2k{~H#Wp_MdlQ>u-@5$B_Xm=P<R
ztAB#_=uxuDx+U(fQAsCeo4sB)Vw!ycS7n#b3aMDKb6QyJr;9!N;BU^Ui{_)gu5_Gb
zZ*JSKgfNzyk+2UsNU&07xyfyN{_+>FwO<A*tizw-CU2|@-!_%4v&qTZzJf_wvBTNz
z^<`49@q{Oq32)k*X=-AKs9dA67oo-00)J{tZkejJsFk8(JLFl*GAbyYpQdRrmD#=)
z^~HAb$e1{J0{QV(^fH{U&Jov17k*&A+^oF^dmGKb@xCng(hD0ca?LE&gp@}3anj|u
zfBtEo(K14NU!fD$-B^G##mp+d{k%=?q(qZDtepQxBMqz5(NTySv73?=D%up^Yk%_H
z*AkAC#;Qa8^W5`>Olw;v!){t>VMZI<t0K=mIMGydJ@P<!f2+8?XEUyz-FO0hHJ9$H
z>LAU2cC59gEXJ8AKp}?O?C!ZL7j^H%X#Q-W(Qhn#xbBWOGc|oGxkr;T?#@W}{NPXU
z5Z#}?M*oF!StX!UJ7vHP7+}kv4u71(3t3nQfA%xgHuhmZ`YEYN#j(+J1|hD7U=SKW
znaKnx&@@Z*uNxGUjx06-iPJeyL<>X;6F`WFjycc{$&gwkY9Ou|>|})-dBYAhAsQi~
zkcjt_!#j{*GA82i2Rf9(2e5*Nprp`)B!q(x{~MUaleF*=Q2fIf2%!cr=6|qJSb!fM
zwn!2q=E8(Agd+ws;Kd)rq6lUTBPp=34?ZqX5|H4bAT<C;MARS?%Sb^X{m95hI`WZ_
zjHDa}Nk>FV@{*X$qz8IZ$wey2l9~*qC`0L*G8XcQqfDhLHTf%6(8ra)Sfwmy=||Ol
zkuGP9B`tT!%PMYdA<G&@Hh+3a%wkR^d>@*J4P;`>X6|xW?3rGJnCZ-Fj?yrsFwFPz
zrVnd+Gm||Un1)hE&2O3$lIBre;gScHbGp-!ky9t_Qd7J<zVn`&jHfoIq|cn-^PeCn
zT{eA`BDetbpd6?~Z!C43dWsRD5Piiu6_x)dz+t2e5sj#-{)SEL{eL2(AdR6q723MY
zJv5{cz24eX+Ru-oG^CcJlvwoU&zFL<btJ{6Lv?9Wgf=vtU5i*@dYaK}iElw}I~q|V
z3e77?lW@gbYD$v_sCeFPr&2{|IMYW@kA5Pn2TiBtDwR#Fg7u#*rD*Do<%hGPwWZ|&
zjX~XdPk}~mN@A@kU4PxF(55hSrFz|~Ijf}7vzcy~f<5O(&o@xm;Uckv4OZTO=heqT
z)|-WePkq=rmdk!Krr5&k?GWqPYT}fvW#vq1t@%@-87Z&zT&-!}cGQDu3wE+~W>a6p
zwa0l1mAN%$Spfw=#u5Q)oegd^lLW@6HU?#M_Eau0ZK(sDzAP{r(*3MaTv?(w6fwKn
hRU;9jt3P#sce!_bf+ewdUUOp9kc5<Ddo`H=06Qn3mHYqz

delta 1824
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
OOz14~2wqMm002AQRBg8a

diff --git a/source/m_editor_map.cpp b/source/m_editor_map.cpp
index 780cc9c..fa83a46 100644
--- a/source/m_editor_map.cpp
+++ b/source/m_editor_map.cpp
@@ -30,10 +30,10 @@ namespace modules
             if ( (x>=-32) && (x<520) && (y>=-16) && (y<240) )
             {
                 draw::color(RED);
-                if (minirooms[room].exits[XN] != 255) { draw::isoline(x,y,-1,-1,14); draw::isoline(x,y-1,-1,-1,14); draw::isoline(x,y+1,-1,-1,14); }
-                if (minirooms[room].exits[YN] != 255) { draw::isoline(x,y,+1,-1,14); draw::isoline(x,y-1,+1,-1,14); draw::isoline(x,y+1,+1,-1,14); }
-                if (minirooms[room].exits[XP] != 255) { draw::isoline(x,y,+1,+1,14); draw::isoline(x,y-1,+1,+1,14); draw::isoline(x,y+1,+1,+1,14); }
-                if (minirooms[room].exits[YP] != 255) { draw::isoline(x,y,-1,+1,14); draw::isoline(x,y-1,-1,+1,14); draw::isoline(x,y+1,-1,+1,14); }
+                if (minirooms[room].exits[XN] != 255) { draw::isoline(x,y,-1,-1,14); /*draw::isoline(x,y-1,-1,-1,14);*/ draw::isoline(x,y+1,-1,-1,14); }
+                if (minirooms[room].exits[YN] != 255) { draw::isoline(x,y,+1,-1,14); /*draw::isoline(x,y-1,+1,-1,14);*/ draw::isoline(x,y+1,+1,-1,14); }
+                if (minirooms[room].exits[XP] != 255) { draw::isoline(x,y,+1,+1,14); /*draw::isoline(x,y-1,+1,+1,14);*/ draw::isoline(x,y+1,+1,+1,14); }
+                if (minirooms[room].exits[YP] != 255) { draw::isoline(x,y,-1,+1,14); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::isoline(x,y+1,-1,+1,14); }
             }
             if (minirooms[room].exits[XN] != 255) drawLines(minirooms[room].exits[XN], x-24, y-12);
             if (minirooms[room].exits[XP] != 255) drawLines(minirooms[room].exits[XP], x+24, y+12);
@@ -41,29 +41,26 @@ namespace modules
             if (minirooms[room].exits[YP] != 255) drawLines(minirooms[room].exits[YP], x-24, y+12);
         }
 
-        void drawRoom(const int room, const int x, const int y)
+        void drawRoom(const int room, const int x, const int y, const bool shadow=false)
         {
             if (drawn[room]) return;
             drawn[room] = true;
             if ( (x>=-32) && (x<520) && (y>=-16) && (y<240) )
             {
                 draw::stencil::set(room);
-                draw::swapcol(1, minirooms[room].color);
+                draw::swapcol(1, !shadow ? minirooms[room].color : 2);
                 draw::draw(x-16, y-8, 32, 16, minirooms[room].w*32, minirooms[room].h*16);
                 
-                //draw::swapcol(1, RED);
-                //if (minirooms[room].exits[XN] != 255) draw::draw(x-4-(minirooms[room].w*2), y-5-(minirooms[room].w),4,5,0,64);
-                //if (minirooms[room].exits[YN] != 255) draw::draw(x+(minirooms[room].h*2), y-5-(minirooms[room].h),4,5,3,64);
-                //if (minirooms[room].exits[XP] != 255) draw::draw(x+(minirooms[room].w*2), y-3+(minirooms[room].w),4,5,0,64);
-                //if (minirooms[room].exits[YP] != 255) draw::draw(x-4-(minirooms[room].h*2), y-3+(minirooms[room].h),4,5,3,64);
-
-                char num[] = "00"; num[0] = 48+(room/10); num[1] = 48+(room%10);
-                draw::print(num, x-4, y-3, LIGHT+(room==current_room?YELLOW:WHITE), BLACK);
+                if (!shadow)
+                {
+                    char num[] = "00"; num[0] = 48+(room/10); num[1] = 48+(room%10);
+                    draw::print(num, x-4, y-3, LIGHT+(room==current_room?YELLOW:WHITE), BLACK);
+                }
             }
-            if (minirooms[room].exits[XN] != 255) drawRoom(minirooms[room].exits[XN], x-24, y-12);
-            if (minirooms[room].exits[XP] != 255) drawRoom(minirooms[room].exits[XP], x+24, y+12);
-            if (minirooms[room].exits[YN] != 255) drawRoom(minirooms[room].exits[YN], x+24, y-12);
-            if (minirooms[room].exits[YP] != 255) drawRoom(minirooms[room].exits[YP], x-24, y+12);
+            if (minirooms[room].exits[XN] != 255) drawRoom(minirooms[room].exits[XN], x-24, y-12, shadow);
+            if (minirooms[room].exits[XP] != 255) drawRoom(minirooms[room].exits[XP], x+24, y+12, shadow);
+            if (minirooms[room].exits[YN] != 255) drawRoom(minirooms[room].exits[YN], x+24, y-12, shadow);
+            if (minirooms[room].exits[YP] != 255) drawRoom(minirooms[room].exits[YP], x-24, y+12, shadow);
         }
 
         void loadMiniRoom()
@@ -103,12 +100,11 @@ namespace modules
 
             drawLines(room::getCurrent(), scroll.x, scroll.y);
 
-            draw::swapcol(1, RED);
             for (int y=-1; y<=1; ++y)
                 for (int x=-1; x<=1; ++x)
                 {
                     for (int i=0;i<64;++i) drawn[i]=false;
-                    drawRoom(room::getCurrent(), scroll.x+x, scroll.y+y);
+                    drawRoom(room::getCurrent(), scroll.x+x, scroll.y+y, true);
                 }
 
         }