- [NEW] Més malotes

- [FIX] Els malotes no mataven des d'agunes posicions
- Més habitacions

data/rooms/13.txt

@@ -4,7 +4,7 @@ door-height-xn: 1
 door-height-yn: 1
 color: CYAN
 floor-texture: 0
-wall-texture: 0
+wall-texture: 2
 door-texture: 0
 under-door-texture: 0
 exit-xn: 12
@@ -12,11 +12,33 @@ exit-yn: 14
 exit-zn: 18
 
 actor{
-    name: LIFT18
+    name: LIFT13
     bmp: caixes.gif
     bmp-rect: 160 128 32 32
     bmp-offset: 0 32
-    pos: 8 8 0
+    pos: 8 32 0
+    size: 8 8 4
+    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: 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
@@ -34,23 +56,23 @@ actor{
 }
 
 actor{
-    name: LIFT19
+    name: LIFT18
     bmp: caixes.gif
     bmp-rect: 160 128 32 32
     bmp-offset: 0 32
-    pos: 16 8 0
+    pos: 8 8 0
     size: 8 8 4
     orient: ZP 
     movement: Z
 }
 
 actor{
-    name: LIFT31
+    name: LIFT19
     bmp: caixes.gif
-    bmp-rect: 96 160 32 32
+    bmp-rect: 160 128 32 32
     bmp-offset: 0 32
-    pos: 16 16 0
-    size: 8 8 8
+    pos: 16 8 0
+    size: 8 8 4
     orient: ZP 
     movement: Z
 }
@@ -66,17 +88,6 @@ actor{
     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
@@ -88,17 +99,6 @@ actor{
     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
@@ -110,17 +110,6 @@ actor{
     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
@@ -132,72 +121,6 @@ actor{
     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
@@ -210,18 +133,84 @@ actor{
 }
 
 actor{
-    name: LIFT15
+    name: LIFT29
     bmp: caixes.gif
-    bmp-rect: 160 128 32 32
+    bmp-rect: 96 160 32 32
     bmp-offset: 0 32
-    pos: 8 48 0
-    size: 8 8 4
+    pos: 16 32 0
+    size: 8 8 8
     orient: ZP 
     movement: Z
 }
 
 actor{
-    name: LIFT27
+    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: 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: 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: 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: 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: 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: PLATF
     bmp: caixes.gif
     bmp-rect: 96 160 32 32
     bmp-offset: 0 32
@@ -230,3 +219,14 @@ actor{
     orient: ZP 
     movement: Z
 }
+
+actor{
+    name: PLATH
+    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
+}

data/rooms/17.txt

@@ -1,5 +1,6 @@
-width: 3
+width: 0
 height: 3
+door-height-xn: 1
 door-height-yn: 0
 color: CYAN
 floor-texture: 0
@@ -9,94 +10,21 @@ under-door-texture: 0
 exit-yn: 9
 
 actor{
-    name: BLOCMATA
+    name: FINESTRA-00
     bmp: altres.gif
-    bmp-rect: 0 133 32 27
-    bmp-offset: 0 27
-    pos: 16 16 0
-    size: 8 8 6
-    flags: REACTIVE DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
+    bmp-rect: 48 76 18 32
+    bmp-offset: 0 39
+    pos: 23 8 4
+    size: 1 1 9
     movement: CW
 }
 
 actor{
-    name: BUBBLE
+    name: FINESTRA-01
     bmp: altres.gif
-    bmp-rect: 20 75 28 26
-    bmp-offset: -2 28
-    pos: 56 56 0
-    size: 8 8 8
-    flags: PUSHABLE INERTIA 
-    movement: CW
-}
-
-actor{
-    name: CONV-XP
-    bmp: caixes.gif
-    bmp-rect: 0 128 32 32
-    bmp-offset: 0 32
-    pos: 0 0 0
-    size: 8 8 4
-    orient: XP 
-    anim-cycle: MIN
-    flags: REACTIVE ANIMATED ORIENTABLE 
-    react-mask: ZN 
-    react-push: XP 
-}
-
-actor{
-    name: GAT-BATMAN
-    bmp: gat.gif
-    bmp-rect: 0 0 24 28
-    bmp-offset: -4 32
-    pos: 48 1 0
-    size: 8 8 8
-    orient: YN 
-    anim-wait: 1
-    flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: CW
-}
-
-actor{
-    name: SPECTRUM
-    bmp: caixes.gif
-    bmp-rect: 128 0 32 32
-    bmp-offset: -4 34
-    pos: 24 40 8
-    size: 8 6 2
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: TAULA-A
-    bmp: caixes.gif
-    bmp-rect: 128 32 32 32
-    bmp-offset: 0 32
-    pos: 16 40 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: TAULA-B
-    bmp: caixes.gif
-    bmp-rect: 160 32 32 32
-    bmp-offset: 0 32
-    pos: 24 40 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: TV
-    bmp: caixes.gif
-    bmp-rect: 32 64 32 32
-    bmp-offset: -4 34
-    pos: 16 40 8
-    size: 8 6 8
-    flags: PUSHABLE 
+    bmp-rect: 84 76 18 32
+    bmp-offset: 0 39
+    pos: 23 48 4
+    size: 1 1 9
     movement: CW
 }

data/rooms/18.txt

@@ -1,8 +1,12 @@
 width: 2
 height: 2
-color: CYAN
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
+door-height-xn: 0
+door-height-yn: 0
+color: PURPLE
+floor-texture: 1
+wall-texture: 13
+door-texture: 7
 under-door-texture: 0
+exit-xn: 21
+exit-yn: 19
 exit-zp: 13

data/rooms/19.txt

@@ -0,0 +1,229 @@
+width: 3
+height: 1
+door-height-yp: 0
+door-height-yn: 0
+color: YELLOW
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-yp: 18
+exit-yn: 20
+
+actor{
+    name: BUBBLE-00
+    bmp: altres.gif
+    bmp-rect: 20 75 28 26
+    bmp-offset: -2 28
+    pos: 56 40 6
+    size: 8 8 8
+    flags: PUSHABLE INERTIA 
+    movement: CW
+}
+
+actor{
+    name: BUBBLE-01
+    bmp: altres.gif
+    bmp-rect: 20 75 28 26
+    bmp-offset: -2 28
+    pos: 0 40 6
+    size: 8 8 8
+    flags: PUSHABLE INERTIA 
+    movement: CW
+}
+
+actor{
+    name: CUADRO-00
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 24 24 8
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-01
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 16 24 10
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-02
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 8 24 12
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-03
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 0 24 14
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING DEADLY 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-04
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 32 24 6
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-05
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 40 24 4
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-06
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 48 24 2
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: CUADRO-07
+    bmp: altres.gif
+    bmp-rect: 101 108 17 24
+    bmp-offset: -11 29
+    pos: 56 24 0
+    size: 8 2 8
+    orient: ZN 
+    flags: MOVING 
+    movement: Z
+}
+
+actor{
+    name: INVISI-00
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 24 24 20
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-01
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 16 24 23
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-02
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 8 24 28
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-03
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 0 24 24
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-04
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 32 24 24
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-05
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 40 24 18
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-06
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 48 24 28
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: INVISI-07
+    bmp: caixes.gif
+    bmp-rect: 128 0 16 13
+    bmp-offset: 0 32
+    pos: 56 24 22
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: TRANSPA-00
+    bmp: altres.gif
+    bmp-rect: 0 160 32 32
+    bmp-offset: 0 32
+    pos: 56 40 0
+    size: 8 8 6
+    movement: CW
+}
+
+actor{
+    name: TRANSPA-01
+    bmp: altres.gif
+    bmp-rect: 0 160 32 32
+    bmp-offset: 0 32
+    pos: 0 40 0
+    size: 8 8 6
+    movement: CW
+}

data/rooms/20.txt

@@ -0,0 +1,9 @@
+width: 2
+height: 2
+door-height-yp: 0
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-yp: 19

data/rooms/21.txt

@@ -0,0 +1,122 @@
+width: 2
+height: 2
+door-height-xp: 1
+door-height-xn: 1
+door-height-yp: 1
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xp: 18
+exit-xn: 22
+exit-yp: 24
+exit-zn: 25
+
+actor{
+    name: PLATH-00
+    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: PLATH-01
+    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: PLATH-02
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 32 48 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-03
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 24 48 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-04
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 48 32 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-05
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 48 24 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: TRANSPA-00
+    bmp: altres.gif
+    bmp-rect: 0 160 32 32
+    bmp-offset: 0 32
+    pos: 24 8 0
+    size: 8 8 6
+    flags: DISAPPEAR 
+    movement: CW
+}
+
+actor{
+    name: TRANSPA-01
+    bmp: altres.gif
+    bmp-rect: 0 160 32 32
+    bmp-offset: 0 32
+    pos: 16 8 0
+    size: 8 8 6
+    movement: CW
+}
+
+actor{
+    name: TRANSPA-02
+    bmp: altres.gif
+    bmp-rect: 0 160 32 32
+    bmp-offset: 0 32
+    pos: 32 8 0
+    size: 8 8 6
+    flags: DISAPPEAR 
+    movement: CW
+}
+
+actor{
+    name: TRANSPA-03
+    bmp: altres.gif
+    bmp-rect: 0 160 32 32
+    bmp-offset: 0 32
+    pos: 40 8 0
+    size: 8 8 6
+    movement: CW
+}

data/rooms/22.txt

@@ -0,0 +1,11 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-yp: 0
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xp: 21
+exit-yp: 23

data/rooms/23.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: 22

data/rooms/24.txt

@@ -0,0 +1,13 @@
+width: 2
+height: 2
+door-height-xp: 0
+door-height-yp: 0
+door-height-yn: 4
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xp: 25
+exit-yp: 26
+exit-yn: 21

data/rooms/25.txt

@@ -0,0 +1,10 @@
+width: 2
+height: 2
+door-height-xn: 4
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xn: 24
+exit-zp: 21

data/rooms/26.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: 24

data/templates.txt

@@ -163,6 +163,28 @@ category{
         movement: CW
     }
 
+    actor{
+        name: PLATH
+        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: PLATF
+        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
+    }
+
 }
 
 category{

source/actor.cpp

@@ -531,7 +531,7 @@ namespace actor
         }
 
         if (source->flags & FLAG_DEADLY) {
-            result |= PUSH_KILL;
+            act->push |= PUSH_KILL;
         }
 
         if (source->flags&FLAG_HERO)
@@ -984,6 +984,7 @@ namespace actor
             {
                 if ( (act->flags & FLAG_MOVING) && (act->movement==MOV_Z) ) changeMoving(act);
                 act->push &= ~PUSH_ZN;
+                if ( (act->flags&FLAG_HERO) && (room::getFloor()==11)  ) act->push |= PUSH_KILL;
                 if ( ((act->flags&FLAG_HERO)==0) || (room::getExit(ZN)==-1)  ) return;
 
                 room::load(room::getExit(ZN));

source/m_editor_colors.cpp

@@ -28,6 +28,7 @@ namespace modules
                 if (mouse_inside) {
                     const int new_color = (my-1)/10;
                     room::editor::refColor() = new_color;
+                    room::editor::modify();
                     return false;
                 } else {
                     return false;

source/m_editor_map.cpp

@@ -34,11 +34,15 @@ namespace modules
                 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[ZN] != 255) { draw::vline(x,y,24); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::vline(x+1,y,24); }
+                if (minirooms[room].exits[ZP] != 255) { draw::vline(x,y-24,24); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::vline(x+1,y-24,24); }
             }
             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);
+            if (minirooms[room].exits[ZN] != 255) drawLines(minirooms[room].exits[ZN], x, y+24);
+            if (minirooms[room].exits[ZP] != 255) drawLines(minirooms[room].exits[ZP], x, y-24);
         }
 
         void drawRoom(const int room, const int x, const int y, const bool shadow=false)
@@ -61,6 +65,8 @@ namespace modules
             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);
+            if (minirooms[room].exits[ZN] != 255) drawRoom(minirooms[room].exits[ZN], x, y+24, shadow);
+            if (minirooms[room].exits[ZP] != 255) drawRoom(minirooms[room].exits[ZP], x, y-24, shadow);
         }
 
         void loadMiniRoom()
@@ -72,9 +78,9 @@ namespace modules
             minirooms[room].color = room::getColor(0);
             minirooms[room].w = (room::getSize().x >> 1)-1;
             minirooms[room].h = (room::getSize().y >> 1)-1;
-            for (int i=0; i<ZN; ++i) minirooms[room].exits[i] = room::getExit(i);
+            for (int i=0; i<=ZN; ++i) minirooms[room].exits[i] = room::getExit(i);
 
-            for (int i=0; i<ZN; ++i) {
+            for (int i=0; i<=ZN; ++i) {
                 const int next_room = minirooms[room].exits[i];
                 if ( (next_room >= 0) && (next_room <= 64) && (!drawn[next_room]) ) {
                     room::load(next_room);

source/room.cpp

@@ -328,8 +328,8 @@ namespace room
         draw::swapcol(1, color_schemes[color][0]);
 
         const int floor_row_tiles = int(floor_surf->w/32);
-        const int floor_x = (floor_type%floor_row_tiles)*32;
-        const int floor_y = int(floor_type/floor_row_tiles)*16;
+        int floor_x = (floor_type%floor_row_tiles)*32;
+        int floor_y = int(floor_type/floor_row_tiles)*16;
 
         const int walls_row_tiles = int(walls_surf->w/16);
         const int walls_x = (walls_type%walls_row_tiles)*16;
@@ -357,8 +357,13 @@ namespace room
             draw::setSource(walls_surf);
             draw::draw(164+4*16-(tmin.y-1)*16, -door_height[3]*8+84+4*8+(tmin.y-1)*8, 16, 15, walls_x, walls_y+33, DRAW_FLIP_HORIZONTAL);   // Vora
             draw::setSource(floor_surf);
-            draw::draw(148+3*16-(tmin.y-1)*16, -door_height[3]*8+76+3*8+(tmin.y-1)*8, 32, 15, floor_x, floor_y+1);      // Tile de Piso
-            draw::draw(148+4*16-(tmin.y-1)*16, -door_height[3]*8+76+4*8+(tmin.y-1)*8, 32, 15, floor_x, floor_y+1);      // Tile de Piso
+            if (floor_type==11) {
+                draw::draw(148+3*16-(tmin.y-1)*16, -door_height[3]*8+76+3*8+(tmin.y-1)*8, 32, 15, 0, 1);      // Tile de Piso
+                draw::draw(148+4*16-(tmin.y-1)*16, -door_height[3]*8+76+4*8+(tmin.y-1)*8, 32, 15, 0, 1);      // Tile de Piso
+            } else {
+                draw::draw(148+3*16-(tmin.y-1)*16, -door_height[3]*8+76+3*8+(tmin.y-1)*8, 32, 15, floor_x, floor_y+1);      // Tile de Piso
+                draw::draw(148+4*16-(tmin.y-1)*16, -door_height[3]*8+76+4*8+(tmin.y-1)*8, 32, 15, floor_x, floor_y+1);      // Tile de Piso
+            }
 
             // Pintem la porta
             draw::setSource(doors_surf);
@@ -379,8 +384,13 @@ namespace room
             draw::setSource(walls_surf);
             draw::draw(164+(tmin.x-1)*16-5*16, -door_height[1]*8+84+(tmin.x-1)*8+4*8, 16, 15, walls_x, walls_y+33);   // Vora
             draw::setSource(floor_surf);
-            draw::draw(148+(tmin.x-1)*16-3*16, -door_height[1]*8+76+(tmin.x-1)*8+3*8,32,15,floor_x, floor_y+1);
-            draw::draw(148+(tmin.x-1)*16-4*16, -door_height[1]*8+76+(tmin.x-1)*8+4*8,32,15,floor_x, floor_y+1);
+            if (floor_type==11) {
+                draw::draw(148+(tmin.x-1)*16-3*16, -door_height[1]*8+76+(tmin.x-1)*8+3*8,32,15,0,1);
+                draw::draw(148+(tmin.x-1)*16-4*16, -door_height[1]*8+76+(tmin.x-1)*8+4*8,32,15,0,1);
+            } else {
+                draw::draw(148+(tmin.x-1)*16-3*16, -door_height[1]*8+76+(tmin.x-1)*8+3*8,32,15,floor_x, floor_y+1);
+                draw::draw(148+(tmin.x-1)*16-4*16, -door_height[1]*8+76+(tmin.x-1)*8+4*8,32,15,floor_x, floor_y+1);
+            }
 
             // Pintem la porta
             draw::setSource(doors_surf);
@@ -524,6 +534,11 @@ namespace room
         return color_schemes[color][which];
     }
 
+    int getFloor()
+    {
+        return floor_type;
+    }
+
     int getFloorCount()
     {
         return int(floor_surf->w / 32) * int(floor_surf->h / 16);

source/room.h

@@ -38,6 +38,7 @@ namespace room
     int getDoor(const int d);
     int getExit(const int d);
     int getColor(int which);
+    int getFloor();
 
     int getFloorCount();
     int getDoorCount();