diff options
author | Eugene Sandulenko | 2014-01-17 13:57:17 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2014-01-17 13:57:17 +0200 |
commit | 8388714ac939c91100146872c777126a50101f24 (patch) | |
tree | badfe33147e7353904445c8bb8c20d3cfaf81f0b /engines/fullpipe/scenes/scene35.cpp | |
parent | 8a2b186382c2df86f41bdf4f9d96add0e475551e (diff) | |
download | scummvm-rg350-8388714ac939c91100146872c777126a50101f24.tar.gz scummvm-rg350-8388714ac939c91100146872c777126a50101f24.tar.bz2 scummvm-rg350-8388714ac939c91100146872c777126a50101f24.zip |
FULLPIPE: Renames in scene35. This completes the scene
Diffstat (limited to 'engines/fullpipe/scenes/scene35.cpp')
-rw-r--r-- | engines/fullpipe/scenes/scene35.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp index e63938e555..290213c453 100644 --- a/engines/fullpipe/scenes/scene35.cpp +++ b/engines/fullpipe/scenes/scene35.cpp @@ -38,14 +38,10 @@ namespace Fullpipe { void scene35_initScene(Scene *sc) { - g_vars->scene35_var01 = 200; - g_vars->scene35_var02 = 200; - g_vars->scene35_var03 = 300; - g_vars->scene35_var04 = 300; g_vars->scene35_hose = sc->getStaticANIObject1ById(ANI_HOSE, -1); g_vars->scene35_bellyInflater = sc->getStaticANIObject1ById(ANI_PUZODUV, -1); - g_vars->scene35_var05 = 0; - g_vars->scene35_var06 = 0; + g_vars->scene35_flowCounter = 0; + g_vars->scene35_fliesCounter = 0; MovGraphLink *lnk = getSc2MctlCompoundBySceneId(sc->_sceneId)->getLinkByName(sO_CloseThing); @@ -115,8 +111,8 @@ void sceneHandler35_startFlow() { g_fp->playSound(SND_35_012, 1); } else { - if (!g_vars->scene35_var05) - g_vars->scene35_var05 = 98; + if (!g_vars->scene35_flowCounter) + g_vars->scene35_flowCounter = 98; g_fp->playSound(SND_35_011, 1); } @@ -150,7 +146,7 @@ void sceneHandler35_genFlies() { g_fp->_floaters->_array2[g_fp->_floaters->_array2.size() - 1]->val11 = 8.0; } - g_vars->scene35_var06 = 0; + g_vars->scene35_fliesCounter = 0; } } @@ -184,7 +180,7 @@ int sceneHandler35(ExCommand *cmd) { g_fp->stopAllSoundInstances(SND_35_011); g_fp->playSound(SND_35_012, 1); - g_vars->scene35_var05 = 0; + g_vars->scene35_flowCounter = 0; break; } break; @@ -235,23 +231,23 @@ int sceneHandler35(ExCommand *cmd) { if (g_fp->_aniMan2) { int x = g_fp->_aniMan2->_ox; - if (x < g_fp->_sceneRect.left + g_vars->scene35_var01) - g_fp->_currentScene->_x = x - g_vars->scene35_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->scene35_var01) - g_fp->_currentScene->_x = x + g_vars->scene35_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->scene35_var05 > 0) { - --g_vars->scene35_var05; + if (g_vars->scene35_flowCounter > 0) { + --g_vars->scene35_flowCounter; - if (!g_vars->scene35_var05) + if (!g_vars->scene35_flowCounter) sceneHandler35_stopFlow(); } - g_vars->scene35_var06++; + g_vars->scene35_fliesCounter++; - if (g_vars->scene35_var06 >= 160) + if (g_vars->scene35_fliesCounter >= 160) sceneHandler35_genFlies(); g_fp->_floaters->update(); |