diff options
author | Eugene Sandulenko | 2013-12-23 00:38:59 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2013-12-23 00:39:27 +0200 |
commit | cb411b3fa0ce135aa73a8aef2961f5218f65b23c (patch) | |
tree | 544c09899044ff46a8c3679584a6575195dbe40c | |
parent | f8d1633de90a4f5cd70b8d1d7b474c70f71ab8e0 (diff) | |
download | scummvm-rg350-cb411b3fa0ce135aa73a8aef2961f5218f65b23c.tar.gz scummvm-rg350-cb411b3fa0ce135aa73a8aef2961f5218f65b23c.tar.bz2 scummvm-rg350-cb411b3fa0ce135aa73a8aef2961f5218f65b23c.zip |
FULLPIPE: Renames in scene08
-rw-r--r-- | engines/fullpipe/scenes.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes.h | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene08.cpp | 28 |
3 files changed, 18 insertions, 18 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 1ab512c31d..08b9357120 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -146,8 +146,8 @@ Vars::Vars() { scene08_batuta = 0; scene08_vmyats = 0; scene08_clock = 0; - scene08_var01 = 0; - scene08_var02 = 0; + scene08_inArcade = false; + scene08_flyingUp = false; scene08_var03 = 0; scene08_var04 = 0; scene08_var05 = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 38c3fb3fb6..b5d6562d6b 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -196,8 +196,8 @@ public: StaticANIObject *scene08_batuta; StaticANIObject *scene08_vmyats; StaticANIObject *scene08_clock; - int scene08_var01; - int scene08_var02; + bool scene08_inArcade; + bool scene08_flyingUp; int scene08_var03; int scene08_var04; int scene08_var05; diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp index 9c904e1f7f..76f22721be 100644 --- a/engines/fullpipe/scenes/scene08.cpp +++ b/engines/fullpipe/scenes/scene08.cpp @@ -38,8 +38,8 @@ namespace Fullpipe { void scene08_initScene(Scene *sc) { g_vars->scene08_var06 = 0; - g_vars->scene08_var01 = 0; - g_vars->scene08_var02 = 0; + g_vars->scene08_inArcade = false; + g_vars->scene08_flyingUp = false; g_vars->scene08_var03 = 0; g_vars->scene08_batuta = sc->getStaticANIObject1ById(ANI_BATUTA, -1); g_vars->scene08_vmyats = sc->getStaticANIObject1ById(ANI_VMYATS, -1); @@ -141,7 +141,7 @@ void sceneHandler08_enterUp() { chainObjQueue(g_fp->_aniMan, QU_SC8_FINISH, 1); - g_vars->scene08_var01 = 0; + g_vars->scene08_inArcade = false; } void sceneHandler08_winArcade() { @@ -172,7 +172,7 @@ void sceneHandler08_arcadeNow() { void sceneHandler08_resumeFlight() { g_vars->scene08_var08 = 3; g_vars->scene08_var04 = -39; - g_vars->scene08_var01 = 1; + g_vars->scene08_inArcade = true; g_vars->scene08_var07 = 0; } @@ -219,8 +219,8 @@ int sceneHandler08_updateScreenCallback() { void sceneHandler08_startArcade() { g_vars->scene08_var06 = 1; - g_vars->scene08_var01 = 1; - g_vars->scene08_var02 = 0; + g_vars->scene08_inArcade = true; + g_vars->scene08_flyingUp = false; g_vars->scene08_var03 = 0; getGameLoaderInteractionController()->disableFlag24(); @@ -326,7 +326,7 @@ void sceneHandler08_badLuck() { g_fp->setObjectState(sO_StairsUp_8, g_fp->getObjectEnumState(sO_StairsUp_8, sO_NotBroken)); - g_vars->scene08_var01 = 0; + g_vars->scene08_inArcade = false; } void sceneHandler08_sitDown() { @@ -338,7 +338,7 @@ void sceneHandler08_sitDown() { g_vars->scene08_vmyats->changeStatics2(ST_VMT_MIN); g_vars->scene08_vmyats->hide(); - g_vars->scene08_var01 = 0; + g_vars->scene08_inArcade = false; g_vars->scene08_var03 = 1; } @@ -391,7 +391,7 @@ void sceneHandler08_calcFlight() { } void sceneHandler08_checkEndArcade() { - if (g_vars->scene08_var02) { + if (g_vars->scene08_flyingUp) { int x = g_fp->_aniMan->_ox; int y = g_vars->scene08_var08 + g_fp->_aniMan->_oy; @@ -436,7 +436,7 @@ int sceneHandler08(ExCommand *cmd) { g_vars->scene08_vmyats->setOXY(382, 703); g_vars->scene08_vmyats->_priority = 29; g_vars->scene08_vmyats->_callback2 = sceneHandler08_pushCallback; - g_vars->scene08_var01 = 1; + g_vars->scene08_inArcade = true; break; case MSG_SC8_ARCADENOW: @@ -449,7 +449,7 @@ int sceneHandler08(ExCommand *cmd) { case MSG_SC8_GETHIMUP: g_vars->scene08_var08 = 0; - g_vars->scene08_var02 = 1; + g_vars->scene08_flyingUp = true; break; case MSG_STARTARCADE: @@ -458,7 +458,7 @@ int sceneHandler08(ExCommand *cmd) { case 29: if (g_vars->scene08_var06) { - if (g_vars->scene08_var01) { + if (g_vars->scene08_inArcade) { sceneHandler08_airMoves(); break; } @@ -504,7 +504,7 @@ int sceneHandler08(ExCommand *cmd) { g_fp->_floaters->update(); if (g_vars->scene08_var06) { - if (g_vars->scene08_var01) + if (g_vars->scene08_inArcade) sceneHandler08_calcFlight(); } else { Movement *mov = g_fp->_aniMan->_movement; @@ -521,7 +521,7 @@ int sceneHandler08(ExCommand *cmd) { g_fp->startSceneTrack(); } - if (g_vars->scene08_var02) + if (g_vars->scene08_flyingUp) sceneHandler08_checkEndArcade(); if (g_vars->scene08_var05 > 0) { |