- Reordenació de actors en habitacions

data/rooms/00.txt

@@ -9,27 +9,41 @@ under-door-texture: 0
 exit-xp: 1
 
 actor{
-    name: MESITA
+    name: BOX-01
     bmp: caixes.gif
-    bmp-rect: 0 64 32 32
+    bmp-rect: 32 0 32 32
     bmp-offset: 0 32
-    pos: 0 16 0
+    pos: 46 40 0
-    size: 8 8 4
+    size: 8 8 8
+    flags: PUSHABLE 
     movement: CW
 }
 
 actor{
-    name: FINESTRA01
+    name: BOX-02
-    bmp: altres.gif
+    bmp: caixes.gif
-    bmp-rect: 0 75 20 33
+    bmp-rect: 0 0 32 32
-    bmp-offset: 0 39
+    bmp-offset: 0 32
-    pos: 0 23 6
+    pos: 56 40 0
-    size: 1 1 9
+    size: 8 8 8
+    flags: PUSHABLE 
     movement: CW
 }
 
 actor{
-    name: FINESTRA
+    name: BOX-03
+    bmp: caixes.gif
+    bmp-rect: 0 0 32 32
+    bmp-offset: 0 32
+    pos: 52 40 8
+    size: 8 8 8
+    orient: YP 
+    flags: PUSHABLE ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: FINESTRA-01
     bmp: altres.gif
     bmp-rect: 0 75 20 33
     bmp-offset: 0 39
@@ -39,37 +53,17 @@ actor{
 }
 
 actor{
-    name: LLIT
+    name: FINESTRA-02
     bmp: altres.gif
-    bmp-rect: 48 0 57 47
+    bmp-rect: 0 75 20 33
-    bmp-offset: 11 32
+    bmp-offset: 0 39
-    pos: 8 16 0
+    pos: 0 23 6
-    size: 16 16 4
+    size: 1 1 9
     movement: CW
 }
 
 actor{
-    name: MESITA01
+    name: KALLAX-01
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 24 16 0
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: MANCUERNA
-    bmp: altres.gif
-    bmp-rect: 106 33 17 14
-    bmp-offset: -6 20
-    pos: 24 25 0
-    size: 6 4 2
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A
     bmp: altres.gif
     bmp-rect: 0 48 24 27
     bmp-offset: -8 31
@@ -80,6 +74,42 @@ actor{
     movement: CW
 }
 
+actor{
+    name: KALLAX-02
+    bmp: altres.gif
+    bmp-rect: 24 48 24 27
+    bmp-offset: -8 31
+    pos: 32 16 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-03
+    bmp: altres.gif
+    bmp-rect: 48 48 24 27
+    bmp-offset: -8 31
+    pos: 40 16 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-04
+    bmp: altres.gif
+    bmp-rect: 72 48 24 27
+    bmp-offset: -8 31
+    pos: 40 16 0
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
 actor{
     name: LAMPARA
     bmp: altres.gif
@@ -91,71 +121,41 @@ actor{
 }
 
 actor{
-    name: KALLAX-A03
+    name: LLIT
     bmp: altres.gif
-    bmp-rect: 72 48 24 27
+    bmp-rect: 48 0 57 47
-    bmp-offset: -8 31
+    bmp-offset: 11 32
-    pos: 40 16 0
+    pos: 8 16 0
-    size: 8 4 8
+    size: 16 16 4
-    orient: YP 
-    flags: ORIENTABLE 
     movement: CW
 }
 
 actor{
-    name: BOX
+    name: MANCUERNA
-    bmp: caixes.gif
-    bmp-rect: 32 0 32 32
-    bmp-offset: 0 32
-    pos: 46 40 0
-    size: 8 8 8
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 0 0 32 32
-    bmp-offset: 0 32
-    pos: 56 40 0
-    size: 8 8 8
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A01
     bmp: altres.gif
-    bmp-rect: 24 48 24 27
+    bmp-rect: 106 33 17 14
-    bmp-offset: -8 31
+    bmp-offset: -6 20
-    pos: 32 16 8
+    pos: 24 25 0
-    size: 8 4 8
+    size: 6 4 2
-    orient: YP 
-    flags: ORIENTABLE 
     movement: CW
 }
 
 actor{
-    name: KALLAX-A02
+    name: MESITA-01
-    bmp: altres.gif
-    bmp-rect: 48 48 24 27
-    bmp-offset: -8 31
-    pos: 40 16 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: BOX02
     bmp: caixes.gif
-    bmp-rect: 0 0 32 32
+    bmp-rect: 0 64 32 32
     bmp-offset: 0 32
-    pos: 52 40 8
+    pos: 0 16 0
-    size: 8 8 8
+    size: 8 8 4
-    orient: YP 
+    movement: CW
-    flags: PUSHABLE ORIENTABLE 
+}
+
+actor{
+    name: MESITA-02
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 24 16 0
+    size: 8 8 4
     movement: CW
 }

data/rooms/01.txt

@@ -13,7 +13,7 @@ exit-xn: 0
 exit-yp: 6
 
 actor{
-    name: CUADRO
+    name: CUADRO-01
     bmp: altres.gif
     bmp-rect: 102 75 18 32
     bmp-offset: 0 39
@@ -25,7 +25,7 @@ actor{
 }
 
 actor{
-    name: CUADRO01
+    name: CUADRO-02
     bmp: altres.gif
     bmp-rect: 66 75 18 32
     bmp-offset: 0 39

data/rooms/02.txt

@@ -10,6 +10,26 @@ under-door-texture: 0
 exit-xn: 1
 exit-yn: 3
 
+actor{
+    name: ARMARI-A1
+    bmp: caixes.gif
+    bmp-rect: 64 32 24 32
+    bmp-offset: -8 36
+    pos: 16 8 0
+    size: 8 4 8
+    movement: CW
+}
+
+actor{
+    name: ARMARI-A2
+    bmp: caixes.gif
+    bmp-rect: 96 32 24 32
+    bmp-offset: -8 36
+    pos: 16 8 8
+    size: 8 4 8
+    movement: CW
+}
+
 actor{
     name: ARMARI-B1
     bmp: caixes.gif
@@ -21,15 +41,50 @@ actor{
 }
 
 actor{
-    name: ARMARI-A1
+    name: ARMARI-B2
     bmp: caixes.gif
-    bmp-rect: 64 32 24 32
+    bmp-rect: 96 32 24 32
     bmp-offset: -8 36
-    pos: 16 8 0
+    pos: 4 8 8
     size: 8 4 8
     movement: CW
 }
 
+actor{
+    name: BOOSTER
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 56 8 6
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
+actor{
+    name: BOX-01
+    bmp: caixes.gif
+    bmp-rect: 32 0 32 32
+    bmp-offset: 0 32
+    pos: 14 24 0
+    size: 8 8 8
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: BOX-02
+    bmp: caixes.gif
+    bmp-rect: 0 0 32 32
+    bmp-offset: 0 32
+    pos: 13 16 0
+    size: 8 8 8
+    flags: PUSHABLE 
+    movement: CW
+}
+
 actor{
     name: KALLAX-01
     bmp: altres.gif
@@ -41,13 +96,12 @@ actor{
 }
 
 actor{
-    name: BOX01
+    name: KALLAX-02
-    bmp: caixes.gif
+    bmp: altres.gif
-    bmp-rect: 0 0 32 32
+    bmp-rect: 72 48 24 27
-    bmp-offset: 0 32
+    bmp-offset: 0 31
-    pos: 13 16 0
+    pos: 0 12 8
-    size: 8 8 8
+    size: 4 12 8
-    flags: PUSHABLE 
     movement: CW
 }
 
@@ -72,59 +126,14 @@ actor{
 }
 
 actor{
-    name: ARMARI-B2
+    name: PILOTA
-    bmp: caixes.gif
+    bmp: altres.gif
-    bmp-rect: 96 32 24 32
+    bmp-rect: 0 108 22 22
-    bmp-offset: -8 36
+    bmp-offset: -5 24
-    pos: 4 8 8
+    pos: 28 32 0
-    size: 8 4 8
-    movement: CW
-}
-
-actor{
-    name: ARMARI-A2
-    bmp: caixes.gif
-    bmp-rect: 96 32 24 32
-    bmp-offset: -8 36
-    pos: 16 8 8
-    size: 8 4 8
-    movement: CW
-}
-
-actor{
-    name: BOOSTER
-    bmp: objectes.gif
-    bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
-    pos: 56 8 6
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: BOX
-    bmp: caixes.gif
-    bmp-rect: 32 0 32 32
-    bmp-offset: 0 32
-    pos: 14 24 0
-    size: 8 8 8
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: ROOMBA-02
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 56 24 0
     size: 8 8 2
-    orient: YP 
+    orient: XN 
-    flags: REACTIVE MOVING DEADLY 
+    flags: PUSHABLE INERTIA 
-    react-mask: XP XN YP YN ZP ZN 
     movement: CCW
 }
 
@@ -142,23 +151,14 @@ actor{
 }
 
 actor{
-    name: KALLAX-02
+    name: ROOMBA-02
-    bmp: altres.gif
+    bmp: caixes.gif
-    bmp-rect: 72 48 24 27
+    bmp-rect: 160 0 32 32
-    bmp-offset: 0 31
+    bmp-offset: 0 34
-    pos: 0 12 8
+    pos: 56 24 0
-    size: 4 12 8
-    movement: CW
-}
-
-actor{
-    name: PILOTA
-    bmp: altres.gif
-    bmp-rect: 0 108 22 22
-    bmp-offset: -5 24
-    pos: 28 32 0
     size: 8 8 2
-    orient: XN 
+    orient: YP 
-    flags: PUSHABLE INERTIA 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
     movement: CCW
 }

data/rooms/06.txt

@@ -11,20 +11,7 @@ exit-xp: 7
 exit-yn: 1
 
 actor{
-    name: ROOMBA02
+    name: BOX-01
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 16 8 0
-    size: 8 8 2
-    orient: XN 
-    flags: REACTIVE MOVING DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: CW
-}
-
-actor{
-    name: BOX
     bmp: caixes.gif
     bmp-rect: 32 0 32 32
     bmp-offset: 0 32
@@ -35,7 +22,29 @@ actor{
 }
 
 actor{
-    name: BOX09
+    name: BOX-02
+    bmp: caixes.gif
+    bmp-rect: 64 0 32 32
+    bmp-offset: 0 32
+    pos: 28 16 0
+    size: 8 8 8
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: BOX-03
+    bmp: caixes.gif
+    bmp-rect: 0 0 32 32
+    bmp-offset: 0 32
+    pos: 40 16 0
+    size: 8 8 8
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: BOX-04
     bmp: caixes.gif
     bmp-rect: 0 0 32 32
     bmp-offset: 0 32
@@ -47,7 +56,7 @@ actor{
 }
 
 actor{
-    name: BOX08
+    name: BOX-05
     bmp: caixes.gif
     bmp-rect: 0 0 32 32
     bmp-offset: 0 32
@@ -58,42 +67,7 @@ actor{
 }
 
 actor{
-    name: BOX02
+    name: BOX-06
-    bmp: caixes.gif
-    bmp-rect: 64 0 32 32
-    bmp-offset: 0 32
-    pos: 28 16 0
-    size: 8 8 8
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 0 0 32 32
-    bmp-offset: 0 32
-    pos: 40 16 0
-    size: 8 8 8
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: ROOMBA03
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 8 40 0
-    size: 8 8 2
-    orient: YP 
-    flags: REACTIVE MOVING DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: CW
-}
-
-actor{
-    name: BOX06
     bmp: caixes.gif
     bmp-rect: 32 0 32 32
     bmp-offset: 0 32
@@ -104,7 +78,7 @@ actor{
 }
 
 actor{
-    name: BOX11
+    name: BOX-07
     bmp: caixes.gif
     bmp-rect: 32 0 32 32
     bmp-offset: 0 32
@@ -116,7 +90,7 @@ actor{
 }
 
 actor{
-    name: ROOMBA
+    name: ROOMBA-01
     bmp: caixes.gif
     bmp-rect: 160 0 32 32
     bmp-offset: 0 34
@@ -129,7 +103,7 @@ actor{
 }
 
 actor{
-    name: ROOMBA01
+    name: ROOMBA-02
     bmp: caixes.gif
     bmp-rect: 160 0 32 32
     bmp-offset: 0 34
@@ -140,3 +114,29 @@ actor{
     react-mask: XP XN YP YN ZP ZN 
     movement: CW
 }
+
+actor{
+    name: ROOMBA-03
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 16 8 0
+    size: 8 8 2
+    orient: XN 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CW
+}
+
+actor{
+    name: ROOMBA-04
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 8 40 0
+    size: 8 8 2
+    orient: YP 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CW
+}

data/rooms/07.txt

@@ -31,30 +31,15 @@ actor{
 }
 
 actor{
-    name: MESITA
+    name: BOX02
     bmp: caixes.gif
-    bmp-rect: 0 64 32 32
+    bmp-rect: 96 128 32 32
     bmp-offset: 0 32
-    pos: 28 28 0
+    pos: 8 8 16
     size: 8 8 4
-    flags: PUSHABLE 
     movement: CW
 }
 
-actor{
-    name: GAT-BATMAN
-    bmp: gat.gif
-    bmp-rect: 0 0 24 28
-    bmp-offset: -4 32
-    pos: 40 16 0
-    size: 8 8 8
-    orient: XP 
-    anim-wait: 2
-    flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: HUNT
-}
-
 actor{
     name: BOX03
     bmp: caixes.gif
@@ -65,16 +50,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX05
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 48 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: BOX04
     bmp: caixes.gif
@@ -86,21 +61,21 @@ actor{
 }
 
 actor{
-    name: BOX06
+    name: BOX05
     bmp: caixes.gif
     bmp-rect: 64 64 32 32
     bmp-offset: 0 32
-    pos: 48 8 8
+    pos: 8 48 0
     size: 8 8 8
     movement: CW
 }
 
 actor{
-    name: BOX08
+    name: BOX06
     bmp: caixes.gif
     bmp-rect: 64 64 32 32
     bmp-offset: 0 32
-    pos: 8 48 8
+    pos: 48 8 8
     size: 8 8 8
     movement: CW
 }
@@ -116,12 +91,12 @@ actor{
 }
 
 actor{
-    name: BOX02
+    name: BOX08
     bmp: caixes.gif
-    bmp-rect: 96 128 32 32
+    bmp-rect: 64 64 32 32
     bmp-offset: 0 32
-    pos: 8 8 16
+    pos: 8 48 8
-    size: 8 8 4
+    size: 8 8 8
     movement: CW
 }
 
@@ -144,3 +119,28 @@ actor{
     size: 8 8 4
     movement: CW
 }
+
+actor{
+    name: GAT-BATMAN
+    bmp: gat.gif
+    bmp-rect: 0 0 24 28
+    bmp-offset: -4 32
+    pos: 40 16 0
+    size: 8 8 8
+    orient: XP 
+    anim-wait: 2
+    flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: HUNT
+}
+
+actor{
+    name: MESITA
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 28 28 0
+    size: 8 8 4
+    flags: PUSHABLE 
+    movement: CW
+}

data/rooms/08.txt

@@ -10,26 +10,6 @@ under-door-texture: 0
 exit-yp: 9
 exit-yn: 7
 
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 0 8
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX06
-    bmp: caixes.gif
-    bmp-rect: 128 128 32 32
-    bmp-offset: 0 32
-    pos: 24 8 8
-    size: 8 8 4
-    movement: CW
-}
-
 actor{
     name: BOX
     bmp: caixes.gif
@@ -40,6 +20,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX01
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 24 0 8
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX02
     bmp: caixes.gif
@@ -60,6 +50,16 @@ actor{
     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: BOX05
     bmp: caixes.gif
@@ -70,6 +70,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX06
+    bmp: caixes.gif
+    bmp-rect: 128 128 32 32
+    bmp-offset: 0 32
+    pos: 24 8 8
+    size: 8 8 4
+    movement: CW
+}
+
 actor{
     name: BOX07
     bmp: caixes.gif
@@ -80,26 +90,6 @@ actor{
     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
@@ -109,3 +99,13 @@ actor{
     size: 8 8 4
     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
+}

source/m_game.cpp

@@ -517,7 +517,7 @@ namespace modules
                 num[7] = (i%10)+48;
                 draw::print(num, 6, 4+line*9, LIGHT+WHITE, BLACK); line++;
                 
-                act = actor::getFirst();
+                act = actor::alphaOrder(actor::getFirst());
                 while (act)
                 {
                     if ((act->flags&FLAG_NOEDITOR)!=FLAG_NOEDITOR && (act->flags&FLAG_HERO)!=FLAG_HERO) {
@@ -532,7 +532,7 @@ namespace modules
                         draw::print(act->name, 14, 4+line*9, LIGHT+WHITE, BLACK);
                         line++;
                     }
-                    act = act->next;
+                    act = act->next_alpha;
                 }
             }