diff options
| -rw-r--r-- | engines/fullpipe/constants.h | 10 | ||||
| -rw-r--r-- | engines/fullpipe/module.mk | 1 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 13 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 13 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene34.cpp | 11 |
5 files changed, 45 insertions, 3 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index 4f8e33c111..f10b3a8d99 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -1135,6 +1135,16 @@ namespace Fullpipe { #define ST_VNT33_DOWN 2640 #define ST_VNT33_RIGHT 2639 +// Scene 34 +#define ANI_BOOT_34 4560 +#define ANI_CACTUS_34 2381 +#define ANI_LUK_34 2541 +#define ANI_VENT_34 2473 +#define QU_SC34_ENTERLIFT 2819 +#define QU_SC34_EXITLIFT 2820 +#define ST_CTS34_EMPTY 2383 +#define ST_CTS34_GROWNEMPTY2 2475 + // Scene 36 #define ANI_SCISSORS_36 2647 #define ANI_ROTOHRUST 2360 diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index af4e614559..ae259d907c 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -54,6 +54,7 @@ MODULE_OBJS = \ scenes/scene31.o \ scenes/scene32.o \ scenes/scene33.o \ + scenes/scene34.o \ scenes/scene36.o \ scenes/sceneDbg.o diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 4b0a3a1a7e..11f8e19865 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -339,6 +339,19 @@ Vars::Vars() { scene33_ventsState[i] = 0; } + scene34_var01 = 0; + scene34_var02 = 0; + scene34_var03 = 0; + scene34_var04 = 0; + scene34_cactus = 0; + scene34_vent = 0; + scene34_hatch = 0; + scene34_boot = 0; + scene34_var05 = 0; + scene34_var06 = 0; + scene34_var07 = 0; + scene34_var08 = 0; + scene36_rotohrust = 0; scene36_scissors = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index cd614ed1a8..1348740036 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -477,6 +477,19 @@ public: int scene33_ventsX[9]; int scene33_ventsState[9]; + int scene34_var01; + int scene34_var02; + int scene34_var03; + int scene34_var04; + StaticANIObject *scene34_cactus; + StaticANIObject *scene34_vent; + StaticANIObject *scene34_hatch; + StaticANIObject *scene34_boot; + int scene34_var05; + int scene34_var06; + int scene34_var07; + int scene34_var08; + StaticANIObject *scene36_rotohrust; StaticANIObject *scene36_scissors; diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp index e2e2408f15..2361e7c21c 100644 --- a/engines/fullpipe/scenes/scene34.cpp +++ b/engines/fullpipe/scenes/scene34.cpp @@ -32,10 +32,15 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" +#include "fullpipe/floaters.h" namespace Fullpipe { +void sceneHandler34_setExits() { + warning("STUB: sceneHandler34_setExits()"); +} + void scene34_initScene(Scene *sc) { g_vars->scene34_var01 = 200; g_vars->scene34_var02 = 200; @@ -46,7 +51,7 @@ void scene34_initScene(Scene *sc) { g_vars->scene34_hatch = sc->getStaticANIObject1ById(ANI_LUK_34, -1); g_vars->scene34_boot = sc->getStaticANIObject1ById(ANI_BOOT_34, -1); - if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown)) { + if (g_fp->getObjectState(sO_Cactus) == g_fp->getObjectEnumState(sO_Cactus, sO_HasGrown)) { Scene *oldsc = g_fp->_currentScene; g_fp->_currentScene = sc; @@ -73,10 +78,10 @@ void scene34_initScene(Scene *sc) { g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_34")); - g_fp->lift_setButton("Этаж 7", ST_LBN_7N); + g_fp->lift_setButton(sO_Level7, ST_LBN_7N); g_fp->lift_sub5(sc, QU_SC34_ENTERLIFT, QU_SC34_EXITLIFT); - initArcadeKeys("SC_34"); + g_fp->initArcadeKeys("SC_34"); } } // End of namespace Fullpipe |