diff options
author | Eugene Sandulenko | 2014-01-02 14:02:21 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2014-01-02 14:02:21 +0200 |
commit | 8deb6908e24ba1110be142390d083b1c57385389 (patch) | |
tree | 2c9914b787400de4a01aeb321a68a77e8bfa8352 | |
parent | 64b001e8697bcc87d9bdbed6acddabc05277b747 (diff) | |
download | scummvm-rg350-8deb6908e24ba1110be142390d083b1c57385389.tar.gz scummvm-rg350-8deb6908e24ba1110be142390d083b1c57385389.tar.bz2 scummvm-rg350-8deb6908e24ba1110be142390d083b1c57385389.zip |
FULLPIPE: Rename vars in scene30
-rw-r--r-- | engines/fullpipe/scenes.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/scenes.h | 6 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene30.cpp | 17 |
3 files changed, 8 insertions, 21 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 0a95b5e9f3..03309775d5 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -261,12 +261,8 @@ Vars::Vars() { scene24_jet = 0; scene24_drop = 0; - scene30_var01 = 0; - scene30_var02 = 0; - scene30_var03 = 0; - scene30_var04 = 0; scene30_leg = 0; - scene30_var05 = 0; + scene30_liftFlag = 1; scene31_chantingCountdown = 0; scene31_cactus = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 296e3d1bac..d8a1b1825a 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -354,12 +354,8 @@ public: StaticANIObject *scene24_jet; StaticANIObject *scene24_drop; - int scene30_var01; - int scene30_var02; - int scene30_var03; - int scene30_var04; StaticANIObject *scene30_leg; - int scene30_var05; + int scene30_liftFlag; int scene31_chantingCountdown; StaticANIObject *scene31_cactus; diff --git a/engines/fullpipe/scenes/scene30.cpp b/engines/fullpipe/scenes/scene30.cpp index 13e9477f68..59cb83efcd 100644 --- a/engines/fullpipe/scenes/scene30.cpp +++ b/engines/fullpipe/scenes/scene30.cpp @@ -46,11 +46,6 @@ void scene30_enablePass(Scene *sc) { } void scene30_initScene(Scene *sc, int flag) { - g_vars->scene30_var01 = 200; - g_vars->scene30_var02 = 200; - g_vars->scene30_var03 = 300; - g_vars->scene30_var04 = 300; - Scene *oldsc = g_fp->_currentScene; g_vars->scene30_leg = sc->getStaticANIObject1ById(ANI_LEG, -1); @@ -72,9 +67,9 @@ void scene30_initScene(Scene *sc, int flag) { scene30_enablePass(sc); if (flag == LiftUp || flag == LiftDown) - g_vars->scene30_var05 = 0; + g_vars->scene30_liftFlag = 0; else - g_vars->scene30_var05 = 1; + g_vars->scene30_liftFlag = 1; g_fp->lift_setButton(sO_Level8, ST_LBN_8N); @@ -139,11 +134,11 @@ int sceneHandler30(ExCommand *cmd) { if (g_fp->_aniMan2) { int x = g_fp->_aniMan2->_ox; - if (x < g_fp->_sceneRect.left + g_vars->scene30_var01) - g_fp->_currentScene->_x = x - g_vars->scene30_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->scene30_var01) - g_fp->_currentScene->_x = x + g_vars->scene30_var03 - g_fp->_sceneRect.right; + if (x > g_fp->_sceneRect.right - 200) + g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right; } g_fp->_behaviorManager->updateBehaviors(); |