diff options
| author | Eugene Sandulenko | 2014-01-01 23:07:58 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-01 23:08:15 +0200 |
| commit | 065118d8b67b9bbc19b0bedb54a46ef27db89520 (patch) | |
| tree | f17ec9cc8f8b11d3ff927f49b2aacce443f3a188 /engines/fullpipe | |
| parent | 4b507b2878a27f91fe172ca5b494c71ff98c30fd (diff) | |
| download | scummvm-rg350-065118d8b67b9bbc19b0bedb54a46ef27db89520.tar.gz scummvm-rg350-065118d8b67b9bbc19b0bedb54a46ef27db89520.tar.bz2 scummvm-rg350-065118d8b67b9bbc19b0bedb54a46ef27db89520.zip | |
FULLPIPE: Plug scene17 in
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/constants.h | 3 | ||||
| -rw-r--r-- | engines/fullpipe/module.mk | 1 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 10 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 10 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene17.cpp | 18 |
5 files changed, 33 insertions, 9 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index 07b761bd2c..013e920090 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -688,6 +688,9 @@ namespace Fullpipe { #define ST_MUG_EMPTY 1298 #define ST_MUG_FULL 1360 +// Scene 17 +#define ANI_HAND17 1446 + // Scene 24 #define ANI_DROP_24 3505 #define ANI_JET24 1837 diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index b9a82fa415..ea8376760f 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -39,6 +39,7 @@ MODULE_OBJS = \ scenes/scene14.o \ scenes/scene15.o \ scenes/scene16.o \ + scenes/scene17.o \ scenes/scene24.o \ scenes/sceneDbg.o \ scenes/sceneIntro.o diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index e5e5f9445f..ed3e6960af 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -239,6 +239,16 @@ Vars::Vars() { scene16_sound = 0; scene16_placeIsOccupied = false; + scene17_var01 = 0; + scene17_var02 = 0; + scene17_var03 = 0; + scene17_var04 = 0; + scene17_var05 = 0; + scene17_var06 = 0; + scene17_var07 = 0; + scene17_var08 = 0; + scene17_hand = 0; + scene24_jetIsOn = false; scene24_flowIsLow = false; scene24_waterIsOn = false; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 4ad961b258..d055b252d0 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -320,6 +320,16 @@ public: int scene16_sound; bool scene16_placeIsOccupied; + int scene17_var01; + int scene17_var02; + int scene17_var03; + int scene17_var04; + int scene17_var05; + int scene17_var06; + int scene17_var07; + int scene17_var08; + StaticANIObject *scene17_hand; + bool scene24_jetIsOn; bool scene24_flowIsLow; bool scene24_waterIsOn; diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/fullpipe/scenes/scene17.cpp index 7251aae550..3a2c725dfa 100644 --- a/engines/fullpipe/scenes/scene17.cpp +++ b/engines/fullpipe/scenes/scene17.cpp @@ -37,15 +37,15 @@ namespace Fullpipe { void scene17_initScene(Scene *sc) { - g_vars->scene17_var01 = 200; - g_vars->scene17_var02 = 200; - g_vars->scene17_var03 = 300; - g_vars->scene17_var04 = 300; - g_vars->scene17_var05 = 1; - g_vars->scene17_var06 = 0; - g_vars->scene17_var07 = 0; - g_vars->scene17_var08 = 0; - g_vars->scene17_hand = sc->getStaticANIObject1ById(ANI_HAND17, -1); + g_vars->scene17_var01 = 200; + g_vars->scene17_var02 = 200; + g_vars->scene17_var03 = 300; + g_vars->scene17_var04 = 300; + g_vars->scene17_var05 = 1; + g_vars->scene17_var06 = 0; + g_vars->scene17_var07 = 0; + g_vars->scene17_var08 = 0; + g_vars->scene17_hand = sc->getStaticANIObject1ById(ANI_HAND17, -1); } } // End of namespace Fullpipe |