diff options
-rw-r--r-- | engines/fullpipe/scenes.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/scenes.h | 6 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene05.cpp | 25 |
3 files changed, 19 insertions, 18 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index a36b30a613..41bec4df93 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -106,9 +106,9 @@ Vars::Vars() { scene05_handle = 0; scene05_wacko = 0; scene05_bigHatch = 0; - scene05_var01 = 0; - scene05_var02 = 0; - scene05_var03 = 0; + scene05_wackoTicker = 0; + scene05_handleFlipper = 0; + scene05_floatersTicker = 0; selector = 0; } diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 4645d8bf9c..4c7302d9b7 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -137,9 +137,9 @@ public: StaticANIObject *scene05_handle; StaticANIObject *scene05_wacko; StaticANIObject *scene05_bigHatch; - int scene05_var01; - int scene05_var02; - int scene05_var03; + int scene05_wackoTicker; + int scene05_handleFlipper; + int scene05_floatersTicker; PictureObject *selector; }; diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp index f050913747..00861d951e 100644 --- a/engines/fullpipe/scenes/scene05.cpp +++ b/engines/fullpipe/scenes/scene05.cpp @@ -40,9 +40,9 @@ void scene05_initScene(Scene *sc) { g_vars->scene05_bigHatch = sc->getStaticANIObject1ById(ANI_BIGLUK, -1); - g_vars->scene05_var01 = 0; - g_vars->scene05_var02 = 1; - g_vars->scene05_var03 = 1000; + g_vars->scene05_wackoTicker = 0; + g_vars->scene05_handleFlipper = 1; + g_vars->scene05_floatersTicker = 1000; Scene *oldscene = g_fullpipe->_currentScene; @@ -124,9 +124,9 @@ void sceneHandler05_makeWackoFeedback() { void sceneHandler05_resetTicks() { if (g_fullpipe->_aniMan->_movement && (g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP || g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN)) - g_vars->scene05_var01 = g_fullpipe->_updateTicks; + g_vars->scene05_wackoTicker = g_fullpipe->_updateTicks; else - g_vars->scene05_var01 = 0; + g_vars->scene05_wackoTicker = 0; } void sceneHandler05_genFlies() { @@ -297,7 +297,7 @@ int sceneHandler05(ExCommand *ex) { if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP && g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { sceneHandler05_makeWackoFeedback(); - g_vars->scene05_var01 = 0; + g_vars->scene05_wackoTicker = 0; } break; @@ -336,21 +336,22 @@ int sceneHandler05(ExCommand *ex) { res = 1; } - if (g_vars->scene05_var01) { - if ((g_fullpipe->_updateTicks - g_vars->scene05_var01) > 62) { + if (g_vars->scene05_wackoTicker) { + if ((g_fullpipe->_updateTicks - g_vars->scene05_wackoTicker) > 62) { if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP && g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { - if (g_vars->scene05_var02 % 2) + if (g_vars->scene05_handleFlipper % 2) sceneHandler05_makeWackoFeedback(); - g_vars->scene05_var01 = 0; + g_vars->scene05_wackoTicker = 0; - ++g_vars->scene05_var02; + ++g_vars->scene05_handleFlipper; } } } - ++g_vars->scene05_var03; + ++g_vars->scene05_floatersTicker; + g_fullpipe->_floaters->update(); g_fullpipe->_behaviorManager->updateBehaviors(); |