diff --git a/data/rooms/06.txt b/data/rooms/06.txt index 6c4b35e..5176ce0 100644 --- a/data/rooms/06.txt +++ b/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 } diff --git a/source/actor.cpp b/source/actor.cpp index 7e44fd3..c36606a 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -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; } } diff --git a/source/actor.h b/source/actor.h index e56f78f..f6b4823 100644 --- a/source/actor.h +++ b/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