diff options
author | Eugene Sandulenko | 2013-12-08 15:46:12 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2013-12-08 16:58:50 +0200 |
commit | 99731dfc0e661c30ca5702328babb7b69b981ebd (patch) | |
tree | f03a0b5c3227ee7d71911244701a54c84acd77ee /engines/fullpipe | |
parent | 7cbe0fa2107e93c66cf553704ab0cef978a2e786 (diff) | |
download | scummvm-rg350-99731dfc0e661c30ca5702328babb7b69b981ebd.tar.gz scummvm-rg350-99731dfc0e661c30ca5702328babb7b69b981ebd.tar.bz2 scummvm-rg350-99731dfc0e661c30ca5702328babb7b69b981ebd.zip |
FULLPIPE: Rename in scene04
Diffstat (limited to 'engines/fullpipe')
-rw-r--r-- | engines/fullpipe/scenes.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/scenes.h | 3 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 74d4b2ba1c..9dc4c74b15 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -72,6 +72,7 @@ Vars::Vars() { scene04_coinPut = false; scene04_soundPlaying = false; scene04_dynamicPhaseIndex = 0; + scene04_needJumping = false; scene04_sceneClickX = 0; scene04_sceneClickY = 0; @@ -79,7 +80,6 @@ Vars::Vars() { scene04_dudePosX = 0; scene04_dudePosY = 0; - scene04_var01 = 0; scene04_var02 = 0; scene04_var04 = 0; scene04_walkingKozyawka = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 78013f2bb4..e7960fe010 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -99,6 +99,8 @@ public: bool scene04_coinPut; bool scene04_soundPlaying; + bool scene04_needJumping; + int scene04_dynamicPhaseIndex; int scene04_sceneClickX; int scene04_sceneClickY; @@ -111,7 +113,6 @@ public: int scene04_speakerVariant; int scene04_speakerPhase; - int scene04_var01; int scene04_var02; int scene04_var04; int scene04_var06; diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index e2b124329c..aacc0f1939 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -61,7 +61,7 @@ void scene04_speakerCallback(int *phase) { } void scene04_initScene(Scene *sc) { - g_vars->scene04_var01 = 0; + g_vars->scene04_needJumping = false; g_vars->scene04_bottle = sc->getPictureObjectById(PIC_SC4_BOTTLE, 0); g_vars->scene04_hand = sc->getStaticANIObject1ById(ANI_HAND, -1); g_vars->scene04_plank = sc->getStaticANIObject1ById(ANI_PLANK, -1); @@ -196,7 +196,7 @@ void scene04_initScene(Scene *sc) { } bool sceneHandler04_friesAreWalking() { - if (g_vars->scene04_var01 && g_fullpipe->_aniMan->isIdle() && !(g_fullpipe->_aniMan->_flags & 0x100)) { + if (g_vars->scene04_needJumping && g_fullpipe->_aniMan->isIdle() && !(g_fullpipe->_aniMan->_flags & 0x100)) { int col = g_vars->scene04_ladder->collisionDetection(g_fullpipe->_aniMan); if (col >= 3 && col <= 6 ) { Movement *koz; @@ -324,7 +324,7 @@ void sceneHandler04_jumpOnLadder() { void sceneHandler04_clickPlank() { if (sceneHandler04_friesAreWalking()) sceneHandler04_jumpOnLadder(); - else if (g_vars->scene04_var01) + else if (g_vars->scene04_needJumping) g_fullpipe->playSound(SND_4_033, 0); else if (!g_vars->scene04_soundPlaying) chainQueue(QU_PNK_CLICK, 0); @@ -536,7 +536,7 @@ void sceneHandler04_handTake() { void sceneHandler04_sub17() { StaticANIObject *ball = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_BIGBALL, -1); - if (g_vars->scene04_var01 + if (g_vars->scene04_needJumping && (!ball || !(ball->_flags & 4)) && g_vars->scene04_ladder->collisionDetection(g_fullpipe->_aniMan) > 3) { @@ -763,7 +763,7 @@ int sceneHandler04(ExCommand *ex) { if (g_vars->scene04_coinPut && g_vars->scene04_var18 && !g_vars->scene04_var09 && !g_vars->scene04_soundPlaying) sceneHandler04_goClock(); - if (g_vars->scene04_var01) { + if (g_vars->scene04_needJumping) { if (!g_vars->scene04_soundPlaying) { g_fullpipe->startSceneTrack(); @@ -823,7 +823,7 @@ int sceneHandler04(ExCommand *ex) { sceneHandler04_clickPlank(); ex->_messageKind = 0; - } else if (g_vars->scene04_var01) { + } else if (g_vars->scene04_needJumping) { sceneHandler04_sub8(ex); } else if (!ani || !canInteractAny(g_fullpipe->_aniMan, ani, ex->_keyCode)) { PictureObject *pic = g_fullpipe->_currentScene->getPictureObjectById(picid, 0); |