diff options
| author | Eugene Sandulenko | 2013-12-28 22:04:12 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-12-28 22:04:12 +0200 |
| commit | 0af0d2bc6a28d312f2f284c4ebc3963e0e3be93e (patch) | |
| tree | fe663c8765f7f07951db5208bcd170f00093aef4 /engines/fullpipe | |
| parent | b24b1880beb9dd867dba7629f9bb47fa9c89a1b2 (diff) | |
| download | scummvm-rg350-0af0d2bc6a28d312f2f284c4ebc3963e0e3be93e.tar.gz scummvm-rg350-0af0d2bc6a28d312f2f284c4ebc3963e0e3be93e.tar.bz2 scummvm-rg350-0af0d2bc6a28d312f2f284c4ebc3963e0e3be93e.zip | |
FULLPIPE: Plug scene24 in
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/constants.h | 6 | ||||
| -rw-r--r-- | engines/fullpipe/module.mk | 1 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 11 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 11 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene24.cpp | 4 |
5 files changed, 31 insertions, 2 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index 7fd97d22a9..230d2d4c41 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -551,6 +551,12 @@ namespace Fullpipe { #define ST_GMS_BOOT 1270 #define ST_GMS_BOOTLESS2 3316 +// Scene 24 +#define ANI_DROP_24 3505 +#define ANI_JET24 1837 +#define ANI_WATER24 1834 +#define ST_WTR24_FLOWLOWER 1843 + } // End of namespace Fullpipe #endif /* FULLPIPE_CONSTANTS_H */ diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index 6f8fbe2c71..9720469158 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -36,6 +36,7 @@ MODULE_OBJS = \ scenes/scene11.o \ scenes/scene12.o \ scenes/scene15.o \ + scenes/scene24.o \ scenes/sceneDbg.o \ scenes/sceneIntro.o diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 0a83d1b82c..3bac1dbf86 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -195,6 +195,17 @@ Vars::Vars() { scene15_ladder = 0; scene15_boot = 0; + scene24_var01 = 0; + scene24_var02 = 0; + scene24_var03 = 0; + scene24_var04 = 0; + scene24_var05 = 0; + scene24_var06 = 0; + scene24_var07 = 0; + scene24_water = 0; + scene24_jet = 0; + scene24_drop = 0; + selector = 0; } diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 281e350d80..9788a2e2d9 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -259,6 +259,17 @@ public: PictureObject *scene15_ladder; StaticANIObject *scene15_boot; + int scene24_var01; + int scene24_var02; + int scene24_var03; + int scene24_var04; + int scene24_var05; + int scene24_var06; + int scene24_var07; + StaticANIObject *scene24_water; + StaticANIObject *scene24_jet; + StaticANIObject *scene24_drop; + PictureObject *selector; }; diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp index 3123e9e596..1bf8edbc7e 100644 --- a/engines/fullpipe/scenes/scene24.cpp +++ b/engines/fullpipe/scenes/scene24.cpp @@ -71,11 +71,11 @@ void scene24_initScene(Scene *sc) { g_vars->scene24_water->hide(); - g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened)) + g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened)); } else { g_vars->scene24_var07 = 1; - g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed)) + g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed)); } g_fp->_currentScene = oldsc; |