diff options
| author | Eugene Sandulenko | 2014-01-02 21:01:34 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-02 21:01:34 +0200 |
| commit | b3a9832b6f4821092b99defb4b1e5f59a91755d0 (patch) | |
| tree | 8abf765040b962dab7cd9877f9757c6661d052b4 | |
| parent | 415c370655b75debde9954698a2dbd1d3a8b0a8e (diff) | |
| download | scummvm-rg350-b3a9832b6f4821092b99defb4b1e5f59a91755d0.tar.gz scummvm-rg350-b3a9832b6f4821092b99defb4b1e5f59a91755d0.tar.bz2 scummvm-rg350-b3a9832b6f4821092b99defb4b1e5f59a91755d0.zip | |
FULLPIPE: Plug scene22 in
| -rw-r--r-- | engines/fullpipe/constants.h | 6 | ||||
| -rw-r--r-- | engines/fullpipe/module.mk | 1 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 12 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 12 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene22.cpp | 4 |
5 files changed, 33 insertions, 2 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index 03c9984bcf..a25e97467e 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -737,6 +737,12 @@ namespace Fullpipe { #define ST_GRFB_SIT 1687 #define ST_GRFB_HANG 1638 +// Scene 22 +#define ANI_GIRAFFE_MIDDLE 1981 +#define ANI_MESHOK 1754 +#define ST_GRFM_AFTER 3472 +#define ST_GRFM_NORM 1983 + // 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 245cbaef33..6562e9aa9e 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -42,6 +42,7 @@ MODULE_OBJS = \ scenes/scene17.o \ scenes/scene20.o \ scenes/scene21.o \ + scenes/scene22.o \ scenes/scene24.o \ scenes/scene30.o \ scenes/scene31.o \ diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 65d394fdec..483d3cfdc1 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -257,6 +257,18 @@ Vars::Vars() { scene21_wigglePos = 0.0; scene21_wiggleTrigger = 0; + scene22_var01 = 200; + scene22_var02 = 200; + scene22_var03 = 300; + scene22_var04 = 300; + scene22_bag = 0; + scene22_giraffeMiddle = 0; + scene22_var07 = 0; + scene22_var08 = 0; + scene22_var09 = 0; + scene22_var10 = 1; + scene22_var11 = 1; + scene24_jetIsOn = false; scene24_flowIsLow = false; scene24_waterIsOn = false; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index e3534c8d90..49c25ac872 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -361,6 +361,18 @@ public: double scene21_wigglePos; bool scene21_wiggleTrigger; + int scene22_var01; + int scene22_var02; + int scene22_var03; + int scene22_var04; + StaticANIObject *scene22_bag; + StaticANIObject *scene22_giraffeMiddle; + int scene22_var07; + int scene22_var08; + int scene22_var09; + int scene22_var10; + int scene22_var11; + bool scene24_jetIsOn; bool scene24_flowIsLow; bool scene24_waterIsOn; diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp index 970f5b3aa1..7b36c63674 100644 --- a/engines/fullpipe/scenes/scene22.cpp +++ b/engines/fullpipe/scenes/scene22.cpp @@ -41,12 +41,12 @@ void scene22_initScene(Scene *sc) { g_vars->scene22_var02 = 200; g_vars->scene22_var03 = 300; g_vars->scene22_var04 = 300; - g_vars->scene22_var05 = Scene_getStaticANIObject1ById(sc, ANI_MESHOK, -1); + g_vars->scene22_bag = sc->getStaticANIObject1ById(ANI_MESHOK, -1); Scene *oldsc = g_fp->_currentScene; g_fp->_currentScene = sc; - g_vars->scene22_giraffeMiddle = sc->getStaticANIObject1ById(sc, ANI_GIRAFFE_MIDDLE, -1); + g_vars->scene22_giraffeMiddle = sc->getStaticANIObject1ById(ANI_GIRAFFE_MIDDLE, -1); g_vars->scene22_var07 = 0; g_vars->scene22_var08 = 0; g_vars->scene22_var09 = 0; |