diff options
author | Eugene Sandulenko | 2014-02-10 23:29:59 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2014-02-10 23:30:36 +0200 |
commit | 1970bf81e5591e95a9c5c5aa682afacc05327886 (patch) | |
tree | fdcb5906ef9b8245a88de720d2151f02de1c55ee /engines | |
parent | 39e28d5cf7b4ce1ab8e58aa6a2984a5108cde3c4 (diff) | |
download | scummvm-rg350-1970bf81e5591e95a9c5c5aa682afacc05327886.tar.gz scummvm-rg350-1970bf81e5591e95a9c5c5aa682afacc05327886.tar.bz2 scummvm-rg350-1970bf81e5591e95a9c5c5aa682afacc05327886.zip |
FULLPIPE: Finish renames in scene27. This completes the scene
Diffstat (limited to 'engines')
-rw-r--r-- | engines/fullpipe/scenes/scene27.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp index 2b928b8139..8623b2b9b3 100644 --- a/engines/fullpipe/scenes/scene27.cpp +++ b/engines/fullpipe/scenes/scene27.cpp @@ -33,7 +33,7 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" -#define DBG 1 +#define DBG 0 namespace Fullpipe { @@ -308,7 +308,7 @@ void sceneHandler27_startAiming() { g_fp->_aniMan->_movement->setDynamicPhaseIndex(phase); } -void sceneHandler27_sub04(ExCommand *cmd) { +void sceneHandler27_initAiming(ExCommand *cmd) { g_vars->scene27_aimStartX = cmd->_x; g_vars->scene27_aimStartY = cmd->_y; g_vars->scene27_dudeIsAiming = true; @@ -328,9 +328,9 @@ void sceneHandler27_aimDude() { g_fp->_aniMan->_movement->setDynamicPhaseIndex(phase); } -void sceneHandler27_sub07() { +void sceneHandler27_wipeDo() { for (uint i = 0; i < g_vars->scene27_bats.size(); i++) { - if (g_vars->scene27_bats[i]->currX < 800.0 ) { + if (g_vars->scene27_bats[i]->currX < 800.0) { g_vars->scene27_bats[i]->field_10 = atan2(800.0 - g_vars->scene27_bats[i]->currX, 520.0 - g_vars->scene27_bats[i]->currY); g_vars->scene27_bats[i]->power += 1.0; } @@ -720,7 +720,7 @@ int sceneHandler27(ExCommand *cmd) { case 29: if (g_fp->_aniMan == g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y) && g_vars->scene27_maxPhaseReached) - sceneHandler27_sub04(cmd); + sceneHandler27_initAiming(cmd); break; @@ -739,7 +739,7 @@ int sceneHandler27(ExCommand *cmd) { sceneHandler27_aimDude(); if (g_vars->scene27_wipeIsNeeded) { - sceneHandler27_sub07(); + sceneHandler27_wipeDo(); if (!g_fp->_aniMan->_movement && g_fp->_aniMan->_statics->_staticsId == ST_MAN_RIGHT) g_fp->_aniMan->startAnim(MV_MAN27_FLOW, 0, -1); |