diff options
| author | Eugene Sandulenko | 2014-01-02 10:23:31 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-02 10:45:52 +0200 |
| commit | f5c36318fe085ed548a7b3628cb6ef01a54e6207 (patch) | |
| tree | 5fbb0ad6434389c03b480eab0c7b6345094f7754 /engines/fullpipe | |
| parent | 5686d606f0c7d766a37992075e8e7b8f1fae486e (diff) | |
| download | scummvm-rg350-f5c36318fe085ed548a7b3628cb6ef01a54e6207.tar.gz scummvm-rg350-f5c36318fe085ed548a7b3628cb6ef01a54e6207.tar.bz2 scummvm-rg350-f5c36318fe085ed548a7b3628cb6ef01a54e6207.zip | |
FULLPIPE: Plug scene21 in
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/constants.h | 4 | ||||
| -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/scene21.cpp | 2 |
5 files changed, 28 insertions, 1 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index c1a7487eb3..0dafd6f138 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -723,6 +723,10 @@ namespace Fullpipe { #define ST_MUG17_EMPTY 2739 #define ST_SMG_SIT 1399 +// Scene 21 +#define ANI_GIRAFFE_BOTTOM 1633 +#define ST_GRFB_HANG 1638 + // Scene 24 #define ANI_DROP_24 3505 #define ANI_INV_HAMMER 884 diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index ea8376760f..75b34dc062 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -40,6 +40,7 @@ MODULE_OBJS = \ scenes/scene15.o \ scenes/scene16.o \ scenes/scene17.o \ + scenes/scene21.o \ scenes/scene24.o \ scenes/sceneDbg.o \ scenes/sceneIntro.o diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index c8ace3cd2f..fcacb044c5 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -247,6 +247,17 @@ Vars::Vars() { scene17_handPhase = false; scene17_sceneEdgeX = 0; + scene21_var01 = 0; + scene21_var02 = 0; + scene21_var03 = 0; + scene21_var04 = 0; + scene21_giraffeBottom = 0; + scene21_giraffeBottomX = 0; + scene21_giraffeBottomY = 0; + scene21_var05 = 0; + scene21_var06 = 0.0; + scene21_var07 = 0; + scene24_jetIsOn = false; scene24_flowIsLow = false; scene24_waterIsOn = false; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 358c6bcf2e..ee52f8c8d6 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -333,6 +333,17 @@ public: bool scene17_handPhase; int scene17_sceneEdgeX; + int scene21_var01; + int scene21_var02; + int scene21_var03; + int scene21_var04; + StaticANIObject *scene21_giraffeBottom; + int scene21_giraffeBottomX; + int scene21_giraffeBottomY; + int scene21_var05; + double scene21_var06; + int scene21_var07; + bool scene24_jetIsOn; bool scene24_flowIsLow; bool scene24_waterIsOn; diff --git a/engines/fullpipe/scenes/scene21.cpp b/engines/fullpipe/scenes/scene21.cpp index 3198a18196..017716d46b 100644 --- a/engines/fullpipe/scenes/scene21.cpp +++ b/engines/fullpipe/scenes/scene21.cpp @@ -47,7 +47,7 @@ void scene21_initScene(Scene *sc) { g_vars->scene21_giraffeBottom = sc->getStaticANIObject1ById(ANI_GIRAFFE_BOTTOM, -1); g_fp->_currentScene = sc; - if (g_fp->getObjectState(sO_LowerPipe_21) == g_fp->getObjectEnumState(sO_LowerPipe_21, sO_IsOpened )) { + if (g_fp->getObjectState(sO_LowerPipe_21) == g_fp->getObjectEnumState(sO_LowerPipe_21, sO_IsOpened)) { g_vars->scene21_giraffeBottom->changeStatics2(ST_GRFB_HANG); g_vars->scene21_var05 = 1; g_vars->scene21_var06 = 0.0; |