aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2015-01-02 13:10:04 +0100
committerEugene Sandulenko2015-01-02 13:15:13 +0100
commit76b71cabb9946b443afc803d04b1ca9e71cf5143 (patch)
tree3dcb3df98c6a74a5587e958fa06b8e2506c4c964
parentf4a99656ceab94cfc1c75d34180a5a49dfd43c0f (diff)
downloadscummvm-rg350-76b71cabb9946b443afc803d04b1ca9e71cf5143.tar.gz
scummvm-rg350-76b71cabb9946b443afc803d04b1ca9e71cf5143.tar.bz2
scummvm-rg350-76b71cabb9946b443afc803d04b1ca9e71cf5143.zip
FULLPIPE: Fix bug with unmovable jar in scene04
-rw-r--r--engines/fullpipe/scenes/scene04.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 6b3ddf9640..4a87ae5b87 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -960,6 +960,8 @@ void sceneHandler04_springWobble() {
Common::Point point;
+ int oldpos = g_vars->scene04_spring->getCurrDimensions(point)->y - oldDynIndex;
+
if (g_vars->scene04_dynamicPhaseIndex) {
if (!g_vars->scene04_spring->_movement)
g_vars->scene04_spring->startAnim(MV_SPR_LOWER, 0, -1);
@@ -969,8 +971,9 @@ void sceneHandler04_springWobble() {
g_vars->scene04_spring->changeStatics2(ST_SPR_UP);
}
- if (g_vars->scene04_dynamicPhaseIndex != oldDynIndex)
- sceneHandler04_bottleUpdateObjects(oldDynIndex - g_vars->scene04_dynamicPhaseIndex);
+ if (g_vars->scene04_dynamicPhaseIndex != oldDynIndex) {
+ sceneHandler04_bottleUpdateObjects(oldpos - (g_vars->scene04_spring->getCurrDimensions(point)->y - g_vars->scene04_dynamicPhaseIndex));
+ }
}
void sceneHandler04_leaveScene() {