diff options
| author | Eugene Sandulenko | 2014-01-02 13:24:30 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-02 13:24:30 +0200 |
| commit | 3ccecb9f8e4962e7ac17e6cfa85c7841443fd854 (patch) | |
| tree | 994207961d808ae9b56fe6558544f13a9066ee5e | |
| parent | c2493c0690b3e3bb9ace7f9bfcdc0a1e8c838053 (diff) | |
| download | scummvm-rg350-3ccecb9f8e4962e7ac17e6cfa85c7841443fd854.tar.gz scummvm-rg350-3ccecb9f8e4962e7ac17e6cfa85c7841443fd854.tar.bz2 scummvm-rg350-3ccecb9f8e4962e7ac17e6cfa85c7841443fd854.zip | |
FULLPIPE: Rename vars in scene31
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 6 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 6 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene31.cpp | 22 |
3 files changed, 11 insertions, 23 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 783db9c3b5..69986ab5d5 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -261,11 +261,7 @@ Vars::Vars() { scene24_jet = 0; scene24_drop = 0; - scene31_var01 = 0; - scene31_var02 = 0; - scene31_var03 = 0; - scene31_var04 = 0; - scene31_var05 = 0; + scene31_chantingCountdown = 0; scene31_cactus = 0; scene31_plusMinus = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 91ea142954..66bc0cf950 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -351,11 +351,7 @@ public: StaticANIObject *scene24_jet; StaticANIObject *scene24_drop; - int scene31_var01; - int scene31_var02; - int scene31_var03; - int scene31_var04; - int scene31_var05; + int scene31_chantingCountdown; StaticANIObject *scene31_cactus; StaticANIObject *scene31_plusMinus; diff --git a/engines/fullpipe/scenes/scene31.cpp b/engines/fullpipe/scenes/scene31.cpp index 9874772685..587fc6aaef 100644 --- a/engines/fullpipe/scenes/scene31.cpp +++ b/engines/fullpipe/scenes/scene31.cpp @@ -37,11 +37,7 @@ namespace Fullpipe { void scene31_initScene(Scene *sc) { - g_vars->scene31_var01 = 200; - g_vars->scene31_var02 = 200; - g_vars->scene31_var03 = 300; - g_vars->scene31_var04 = 300; - g_vars->scene31_var05 = 0; + g_vars->scene31_chantingCountdown = 0; g_vars->scene31_cactus = sc->getStaticANIObject1ById(ANI_CACTUS_31, -1); if (g_fp->getObjectState(sO_Cactus) == g_fp->getObjectEnumState(sO_Cactus, sO_HasGrown)) { @@ -90,7 +86,7 @@ int sceneHandler31(ExCommand *cmd) { case MSG_SC15_STOPCHANTING: g_fp->stopAllSoundInstances(SND_31_001); - g_vars->scene31_var05 = 120; + g_vars->scene31_chantingCountdown = 120; break; case MSG_SC31_PULL: @@ -105,17 +101,17 @@ int sceneHandler31(ExCommand *cmd) { if (g_fp->_aniMan2) { int x = g_fp->_aniMan2->_ox; - if (x < g_fp->_sceneRect.left + g_vars->scene31_var01) - g_fp->_currentScene->_x = x - g_vars->scene31_var03 - g_fp->_sceneRect.left; + if (x < g_fp->_sceneRect.left + 200) + g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left; - if (x > g_fp->_sceneRect.right - g_vars->scene31_var01) - g_fp->_currentScene->_x = x + g_vars->scene31_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->scene31_var05 > 0) { - --g_vars->scene31_var05; + if (g_vars->scene31_chantingCountdown > 0) { + --g_vars->scene31_chantingCountdown; - if (!g_vars->scene31_var05) + if (!g_vars->scene31_chantingCountdown) g_fp->playSound(SND_31_001, 1); } |