- [NEW] Boost de vida extra

data/rooms/06.txt

@@ -30,23 +30,15 @@ actor{
 }
 
 actor{
-    name: NEVERA1
+    name: LIFT
     bmp: caixes.gif
-    bmp-rect: 0 96 32 32
-    bmp-offset: 0 32
-    pos: 32 32 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: NEVERA2
-    bmp: caixes.gif
-    bmp-rect: 32 96 32 32
-    bmp-offset: 0 32
-    pos: 32 32 8
-    size: 8 8 8
-    movement: CW
+    bmp-rect: 32 32 32 24
+    bmp-offset: 0 24
+    pos: 56 0 0
+    size: 8 8 4
+    orient: ZP 
+    flags: MOVING 
+    movement: Z
 }
 
 actor{
@@ -63,7 +55,7 @@ actor{
 }
 
 actor{
-    name: B1-00
+    name: B8-00
     bmp: objectes.gif
     bmp-rect: 114 78 15 18
     bmp-offset: -8 22
@@ -102,13 +94,21 @@ actor{
 }
 
 actor{
-    name: LIFT
+    name: NEVERA1
     bmp: caixes.gif
-    bmp-rect: 32 32 32 24
-    bmp-offset: 0 24
-    pos: 56 0 0
-    size: 8 8 4
-    orient: ZP 
-    flags: MOVING 
-    movement: Z
+    bmp-rect: 0 96 32 32
+    bmp-offset: 0 32
+    pos: 32 32 0
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: NEVERA2
+    bmp: caixes.gif
+    bmp-rect: 32 96 32 32
+    bmp-offset: 0 32
+    pos: 32 32 8
+    size: 8 8 8
+    movement: CW
 }

data/rooms/09.txt

@@ -7,22 +7,12 @@ door-texture: 0
 under-door-texture: 0
 
 actor{
-    name: TAULETA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 0 0 0
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: BOX05
+    name: KALLAX-A03
     bmp: altres.gif
-    bmp-rect: 128 0 20 42
-    bmp-offset: -5 46
-    pos: 0 0 4
-    size: 8 8 8
+    bmp-rect: 72 48 24 27
+    bmp-offset: 0 31
+    pos: 0 16 0
+    size: 4 8 8
     movement: CW
 }
 
@@ -31,17 +21,7 @@ actor{
     bmp: altres.gif
     bmp-rect: 0 48 24 27
     bmp-offset: 0 31
-    pos: 0 8 0
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A03
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: 0 31
-    pos: 0 16 0
+    pos: 0 32 0
     size: 4 8 8
     movement: CW
 }
@@ -80,16 +60,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 128 32 32 32
-    bmp-offset: 0 32
-    pos: 16 24 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: KALLAX-A07
     bmp: altres.gif
@@ -102,6 +72,72 @@ actor{
     movement: CW
 }
 
+actor{
+    name: KALLAX-A08
+    bmp: altres.gif
+    bmp-rect: 24 48 24 27
+    bmp-offset: -8 31
+    pos: 32 0 0
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A06
+    bmp: altres.gif
+    bmp-rect: 72 48 24 27
+    bmp-offset: -8 31
+    pos: 24 0 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A09
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: -8 31
+    pos: 32 0 8
+    size: 8 4 8
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
+actor{
+    name: TAULETA
+    bmp: caixes.gif
+    bmp-rect: 0 64 32 32
+    bmp-offset: 0 32
+    pos: 40 0 0
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: BOX05
+    bmp: altres.gif
+    bmp-rect: 128 0 20 42
+    bmp-offset: -5 46
+    pos: 40 0 4
+    size: 8 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX01
+    bmp: caixes.gif
+    bmp-rect: 128 32 32 32
+    bmp-offset: 0 32
+    pos: 16 24 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX02
     bmp: caixes.gif
@@ -114,14 +150,34 @@ actor{
 }
 
 actor{
-    name: KALLAX-A08
+    name: KALLAX-A02
+    bmp: altres.gif
+    bmp-rect: 48 48 24 27
+    bmp-offset: 0 31
+    pos: 0 16 8
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A01
     bmp: altres.gif
     bmp-rect: 24 48 24 27
-    bmp-offset: -8 31
-    pos: 32 0 0
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
+    bmp-offset: 0 31
+    pos: 0 32 8
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: BOX03
+    bmp: caixes.gif
+    bmp-rect: 128 0 32 32
+    bmp-offset: 0 32
+    pos: 16 24 8
+    size: 8 8 2
+    flags: PUSHABLE 
+    react-push: XP 
     movement: CW
 }
 
@@ -138,49 +194,6 @@ actor{
     movement: X
 }
 
-actor{
-    name: KALLAX-A01
-    bmp: altres.gif
-    bmp-rect: 24 48 24 27
-    bmp-offset: 0 31
-    pos: 0 8 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A02
-    bmp: altres.gif
-    bmp-rect: 48 48 24 27
-    bmp-offset: 0 31
-    pos: 0 16 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 128 0 32 32
-    bmp-offset: 0 32
-    pos: 16 24 8
-    size: 8 8 8
-    react-push: XP 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A06
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: -8 31
-    pos: 24 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
 actor{
     name: BOX04
     bmp: caixes.gif
@@ -193,15 +206,3 @@ actor{
     react-push: XP 
     movement: CW
 }
-
-actor{
-    name: KALLAX-A09
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: -8 31
-    pos: 32 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}

source/actor.cpp

@@ -1345,7 +1345,7 @@ namespace actor
 
         void init(const bool complete)
         {
-            actor::actor_t *hero = actor::create("HERO", {16,32,8}, {8,8,12}, "test.gif", {0,32,20,32}, {-6,38});
+            actor::actor_t *hero = actor::create("HERO", {16,32,8}, {6,6,12}, "test.gif", {0,32,20,32}, {-6,38});
             hero->flags = FLAG_HERO | FLAG_PUSHABLE | FLAG_GRAVITY | FLAG_ORIENTABLE | FLAG_ANIMATED;
             actor::setDirty(hero, true);
 
@@ -1376,8 +1376,8 @@ namespace actor
 
         const int getBoosterFromString(char *booster)
         {
-            static const char *boostset_name[3] = {"RUN", "GOD", "JUMP"};
-            for (int i=0;i<3;++i)
+            static const char *boostset_name[4] = {"RUN", "GOD", "JUMP", "LIVE"};
+            for (int i=0;i<4;++i)
             {
                 if (strcmp(booster, boostset_name[i])==0)
                 {
@@ -1395,6 +1395,7 @@ namespace actor
                 case BOOST_GOD: boost_god = 99*2; break;
                 case BOOST_RUN: boost_steps = 99*2; break;
                 case BOOST_JUMP: boost_jumps = 10; break;
+                case BOOST_LIVE: lives++; break;
             }
             return value!=0;
         }
@@ -1407,6 +1408,7 @@ namespace actor
                 case BOOST_GOD: boost_god = 99*2; break;
                 case BOOST_RUN: boost_steps = 99*2; break;
                 case BOOST_JUMP: boost_jumps = 10; break;
+                case BOOST_LIVE: lives++; break;
             }
         }
 

source/actor.h

@@ -49,6 +49,7 @@
 #define BOOST_RUN       1
 #define BOOST_GOD       2
 #define BOOST_JUMP      4
+#define BOOST_LIVE      8
 
 // Skills
 #define SKILL_NONE      0