diff options
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 8 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 8 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene15.cpp | 25 |
3 files changed, 11 insertions, 30 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index d61d48b629..fdfee9753f 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -186,13 +186,7 @@ Vars::Vars() { scene11_var19 = 0; scene11_var20 = 0; - scene15_var01 = 0; - scene15_var02 = 0; - scene15_var03 = 0; - scene15_var04 = 0; - scene15_var05 = 0; - scene15_var06 = 0; - scene15_var07 = 0; + scene15_chantingCountdown = 0; scene15_plusminus = 0; scene15_ladder = 0; scene15_boot = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 941cbc9150..8c4257f633 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -242,13 +242,7 @@ public: int scene11_var19; int scene11_var20; - int scene15_var01; - int scene15_var02; - int scene15_var03; - int scene15_var04; - int scene15_var05; - int scene15_var06; - int scene15_var07; + int scene15_chantingCountdown; StaticANIObject *scene15_plusminus; PictureObject *scene15_ladder; StaticANIObject *scene15_boot; diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp index 04c3466e3c..8310fc8607 100644 --- a/engines/fullpipe/scenes/scene15.cpp +++ b/engines/fullpipe/scenes/scene15.cpp @@ -37,11 +37,7 @@ namespace Fullpipe { void scene15_initScene(Scene *sc) { - g_vars->scene15_var01 = 200; - g_vars->scene15_var02 = 200; - g_vars->scene15_var03 = 300; - g_vars->scene15_var04 = 300; - g_vars->scene15_var05 = 0; + g_vars->scene15_chantingCountdown = 0; StaticANIObject *grandma = sc->getStaticANIObject1ById(ANI_GRANDMA_ASS, -1); @@ -128,7 +124,7 @@ int sceneHandler15(ExCommand *cmd) { case MSG_SC15_STOPCHANTING: g_fp->stopAllSoundInstances(SND_15_001); - g_vars->scene15_var05 = 120; + g_vars->scene15_chantingCountdown = 120; break; case MSG_SC15_ASSDRYG: @@ -190,20 +186,17 @@ int sceneHandler15(ExCommand *cmd) { if (g_fp->_aniMan2) { int x = g_fp->_aniMan2->_ox; - g_vars->scene15_var06 = x; - g_vars->scene15_var07 = g_fp->_aniMan2->_oy; + if (x < g_fp->_sceneRect.left + 200) + g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left; - if (x < g_fp->_sceneRect.left + g_vars->scene15_var01) - g_fp->_currentScene->_x = x - g_vars->scene15_var03 - g_fp->_sceneRect.left; - - if (x > g_fp->_sceneRect.right - g_vars->scene15_var01) - g_fp->_currentScene->_x = x + g_vars->scene15_var03 - g_fp->_sceneRect.right; + if (x > g_fp->_sceneRect.right - 200) + g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right; } - if (g_vars->scene15_var05 > 0) { - g_vars->scene15_var05--; + if (g_vars->scene15_chantingCountdown > 0) { + g_vars->scene15_chantingCountdown--; - if (!g_vars->scene15_var05) + if (!g_vars->scene15_chantingCountdown) g_fp->playSound(SND_15_001, 1); } |