diff options
author | Eugene Sandulenko | 2013-12-12 16:13:10 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2013-12-12 18:12:10 +0200 |
commit | cbf943c2c696a7d92141a9dff44bac09add4ef39 (patch) | |
tree | f6d40fed2bec29188672019885066a5e92ea7397 /engines/fullpipe/scenes | |
parent | 52922fe97c1951b48da5abb616250193b6ea89eb (diff) | |
download | scummvm-rg350-cbf943c2c696a7d92141a9dff44bac09add4ef39.tar.gz scummvm-rg350-cbf943c2c696a7d92141a9dff44bac09add4ef39.tar.bz2 scummvm-rg350-cbf943c2c696a7d92141a9dff44bac09add4ef39.zip |
FULLPIPE: Renames in scene04
Diffstat (limited to 'engines/fullpipe/scenes')
-rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index 5e974cc7e7..07ac109477 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_needJumping = false; + g_vars->scene04_dudeOnLadder = 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_needJumping && g_fullpipe->_aniMan->isIdle() && !(g_fullpipe->_aniMan->_flags & 0x100)) { + if (g_vars->scene04_dudeOnLadder && 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; @@ -310,7 +310,7 @@ void sceneHandler04_walkClimbLadder(ExCommand *ex) { mq->chain(0); - g_vars->scene04_needJumping = 1; + g_vars->scene04_dudeOnLadder = 1; g_vars->scene04_ladder = new MctlLadder; g_vars->scene04_ladder->_objId = MV_MAN_TURN_SUD; @@ -345,7 +345,7 @@ void sceneHandler04_clickLadder() { g_vars->scene04_dudePosX = g_fullpipe->_aniMan->_ox; g_vars->scene04_dudePosY = g_fullpipe->_aniMan->_oy; - if (g_vars->scene04_needJumping) { + if (g_vars->scene04_dudeOnLadder) { if (!g_fullpipe->_aniMan->isIdle() || (g_fullpipe->_aniMan->_flags & 0x100)) { g_vars->scene04_var08 = 1; } else { @@ -426,7 +426,7 @@ void sceneHandler04_jumpOnLadder() { void sceneHandler04_clickPlank() { if (sceneHandler04_friesAreWalking()) sceneHandler04_jumpOnLadder(); - else if (g_vars->scene04_needJumping) + else if (g_vars->scene04_dudeOnLadder) g_fullpipe->playSound(SND_4_033, 0); else if (!g_vars->scene04_soundPlaying) chainQueue(QU_PNK_CLICK, 0); @@ -750,7 +750,7 @@ void sceneHandler04_sub9(StaticANIObject *ani) { void sceneHandler04_sub17() { StaticANIObject *ball = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_BIGBALL, -1); - if (g_vars->scene04_needJumping + if (g_vars->scene04_dudeOnLadder && (!ball || !(ball->_flags & 4)) && g_vars->scene04_ladder->collisionDetection(g_fullpipe->_aniMan) > 3) { @@ -977,7 +977,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_needJumping) { + if (g_vars->scene04_dudeOnLadder) { if (!g_vars->scene04_soundPlaying) { g_fullpipe->startSceneTrack(); @@ -1037,7 +1037,7 @@ int sceneHandler04(ExCommand *ex) { sceneHandler04_clickPlank(); ex->_messageKind = 0; - } else if (g_vars->scene04_needJumping) { + } else if (g_vars->scene04_dudeOnLadder) { sceneHandler04_sub8(ex); } else if (!ani || !canInteractAny(g_fullpipe->_aniMan, ani, ex->_keyCode)) { PictureObject *pic = g_fullpipe->_currentScene->getPictureObjectById(picid, 0); |