diff options
| author | Eugene Sandulenko | 2016-09-05 18:32:48 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-05 18:42:58 +0200 |
| commit | 89dd40cd247fa45349d32a012e2816d2e21cccfe (patch) | |
| tree | 6c1ecc904c44c5cc19a26651a546d1254ec7ed7a | |
| parent | 47683404615fbfc4a6df27c4d0c7217ee288a59f (diff) | |
| download | scummvm-rg350-89dd40cd247fa45349d32a012e2816d2e21cccfe.tar.gz scummvm-rg350-89dd40cd247fa45349d32a012e2816d2e21cccfe.tar.bz2 scummvm-rg350-89dd40cd247fa45349d32a012e2816d2e21cccfe.zip | |
FULLPIPE: Further work on scene09
| -rw-r--r-- | engines/fullpipe/scenes.h | 2 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene09.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 3c20ef49e5..d87cf6b935 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -382,7 +382,7 @@ public: int scene09_intHangerMaxPhase; BallArray scene09_balls; Common::Array<Hanger *> scene09_hangers; - BallArray scene09_flyingBalls; + BallArray scene09_gulpedBalls; int scene09_numMovingHangers; int scene09_clickY; Common::Point scene09_hangerOffsets[4]; diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp index 24b8971d17..e3f113a1f0 100644 --- a/engines/fullpipe/scenes/scene09.cpp +++ b/engines/fullpipe/scenes/scene09.cpp @@ -102,11 +102,11 @@ void scene09_initScene(Scene *sc) { g_vars->scene09_hangers.push_back(hng); } - g_vars->scene09_flyingBalls.clear(); + g_vars->scene09_gulpedBalls.clear(); - g_vars->scene09_flyingBalls.push_back(new Ball); + g_vars->scene09_gulpedBalls.push_back(new Ball); - Ball *b9 = g_vars->scene09_flyingBalls.front(); + Ball *b9 = g_vars->scene09_gulpedBalls.front(); b9->ani = sc->getStaticANIObject1ById(ANI_BALL9, -1); b9->ani->setAlpha(0xc8); @@ -119,7 +119,7 @@ void scene09_initScene(Scene *sc) { b9->ani = newball; - g_vars->scene09_flyingBalls.push_back(b9); + g_vars->scene09_gulpedBalls.push_back(b9); sc->addStaticANIObject(newball, 1); } @@ -238,7 +238,7 @@ void sceneHandler09_eatBall() { ball->ani = g_vars->scene09_flyingBall; - g_vars->scene09_flyingBalls.pop_back(); + g_vars->scene09_gulpedBalls.pop_back(); g_vars->scene09_flyingBall = 0; g_vars->scene09_numSwallenBalls++; @@ -262,12 +262,12 @@ void sceneHandler09_eatBall() { } void sceneHandler09_showBall() { - if (g_vars->scene09_flyingBalls.size()) { - StaticANIObject *ani = g_vars->scene09_flyingBalls.front()->ani; + debugC(2, kDebugSceneLogic, "scene09: showBall"); - g_vars->scene09_flyingBalls.remove_at(0); + if (g_vars->scene09_gulpedBalls.size()) { + StaticANIObject *ani = g_vars->scene09_gulpedBalls.front()->ani; - Ball *ball = g_vars->scene09_balls.front(); + Ball *ball = g_vars->scene09_gulpedBalls.front(); ball->ani = ani; ani->show1(g_fp->_aniMan->_ox + 94, g_fp->_aniMan->_oy - 162, MV_BALL9_EXPLODE, 0); @@ -348,7 +348,7 @@ void sceneHandler09_ballExplode(uint num) { if (!mq->chain(ball->ani)) delete mq; - g_vars->scene09_flyingBalls.pop_back(); + g_vars->scene09_gulpedBalls.pop_back(); } void sceneHandler09_checkHangerCollide() { |