diff options
author | Eugene Sandulenko | 2014-01-22 07:22:53 -0800 |
---|---|---|
committer | Eugene Sandulenko | 2014-01-22 07:27:32 -0800 |
commit | 9a881b833400e5fe9358d4e7ec64deb1d5376eb0 (patch) | |
tree | 068b6684143d67f09c045197c909702ac460eea2 /engines/fullpipe/scenes | |
parent | 4cdf4eb4c4146c29c66124451cc6373bdd170474 (diff) | |
download | scummvm-rg350-9a881b833400e5fe9358d4e7ec64deb1d5376eb0.tar.gz scummvm-rg350-9a881b833400e5fe9358d4e7ec64deb1d5376eb0.tar.bz2 scummvm-rg350-9a881b833400e5fe9358d4e7ec64deb1d5376eb0.zip |
FULLPIPE: Finish renames in scene38
Diffstat (limited to 'engines/fullpipe/scenes')
-rw-r--r-- | engines/fullpipe/scenes/scene38.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/engines/fullpipe/scenes/scene38.cpp b/engines/fullpipe/scenes/scene38.cpp index 324cf8a77a..198a88f25d 100644 --- a/engines/fullpipe/scenes/scene38.cpp +++ b/engines/fullpipe/scenes/scene38.cpp @@ -63,11 +63,11 @@ void scene38_initScene(Scene *sc) { g_vars->scene38_lastBossAnim = 0; g_vars->scene38_bossAnimCounter = 0; g_vars->scene38_tallyCounter = 15; - g_vars->scene38_var09 = 0; - g_vars->scene38_var10 = 0; - g_vars->scene38_var11 = 30; - g_vars->scene38_var12 = 0; - g_vars->scene38_var13 = 0; + g_vars->scene38_lastTallyAnim = 0; + g_vars->scene38_tallyAnimCounter = 0; + g_vars->scene38_shortyCounter = 30; + g_vars->scene38_lastShortyAnim = 0; + g_vars->scene38_shortyAnimCounter = 0; scene38_setBottleState(sc); @@ -128,11 +128,11 @@ void sceneHandler38_point() { void sceneHandler38_hammerKick() { if (!g_vars->scene38_shorty->_movement) { if (g_vars->scene38_shorty->_flags & 4) { - if (!(g_vars->scene38_shorty->_flags & 2) && g_vars->scene38_var11 > 1 + if (!(g_vars->scene38_shorty->_flags & 2) && g_vars->scene38_shortyCounter > 1 && g_vars->scene38_shorty->_statics->_staticsId == ST_MLS_LEFT2 && g_fp->_rnd->getRandomNumber(32767) < 3276) { chainQueue(QU_MLS_TURNR, 0); - g_vars->scene38_var11 = 0; + g_vars->scene38_shortyCounter = 0; } } } @@ -148,11 +148,11 @@ void sceneHandler38_hammerKick() { void sceneHandler38_drink() { if (!g_vars->scene38_shorty->_movement) { if (g_vars->scene38_shorty->_flags & 4) { - if (!(g_vars->scene38_shorty->_flags & 2) && g_vars->scene38_var11 > 0 + if (!(g_vars->scene38_shorty->_flags & 2) && g_vars->scene38_shortyCounter > 0 && g_vars->scene38_shorty->_statics->_staticsId == ST_MLS_LEFT2 && g_fp->_rnd->getRandomNumber(32767) < 3276) { chainQueue(QU_MLS_TURNR, 0); - g_vars->scene38_var11 = 0; + g_vars->scene38_shortyCounter = 0; } } } @@ -256,14 +256,14 @@ void sceneHandler38_animateAlcoholics() { } } - if (g_vars->scene38_var09 == tallyAnim) { - g_vars->scene38_var10++; + if (g_vars->scene38_lastTallyAnim == tallyAnim) { + g_vars->scene38_tallyAnimCounter++; - if (g_vars->scene38_var10++ > 2) + if (g_vars->scene38_tallyAnimCounter++ > 2) tallyAnim = 0; } else { - g_vars->scene38_var09 = tallyAnim; - g_vars->scene38_var10 = 1; + g_vars->scene38_lastTallyAnim = tallyAnim; + g_vars->scene38_tallyAnimCounter = 1; } if (tallyAnim > 0) { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(tallyAnim), 0, 0); @@ -274,13 +274,13 @@ void sceneHandler38_animateAlcoholics() { } if (g_vars->scene38_shorty->_movement || !(g_vars->scene38_shorty->_flags & 4) || (g_vars->scene38_shorty->_flags & 2)) { - g_vars->scene38_var11 = 0; + g_vars->scene38_shortyCounter = 0; return; } - g_vars->scene38_var11++; + g_vars->scene38_shortyCounter++; - if (g_vars->scene38_var11 < 50) + if (g_vars->scene38_shortyCounter < 50) return; int shortyAnim = 0; @@ -300,13 +300,13 @@ void sceneHandler38_animateAlcoholics() { } } - if (g_vars->scene38_var12 == shortyAnim) { - g_vars->scene38_var13++; - if (g_vars->scene38_var13 > 2) + if (g_vars->scene38_lastShortyAnim == shortyAnim) { + g_vars->scene38_shortyAnimCounter++; + if (g_vars->scene38_shortyAnimCounter > 2) return; } else { - g_vars->scene38_var12 = shortyAnim; - g_vars->scene38_var13 = 1; + g_vars->scene38_lastShortyAnim = shortyAnim; + g_vars->scene38_shortyAnimCounter = 1; } if (shortyAnim > 0) { @@ -314,7 +314,7 @@ void sceneHandler38_animateAlcoholics() { mq->chain(0); - g_vars->scene38_var11 = 0; + g_vars->scene38_shortyCounter = 0; } } |