[Scummvm-cvs-logs] scummvm master -> 76b71cabb9946b443afc803d04b1ca9e71cf5143

sev- sev at scummvm.org
Fri Jan 2 13:15:53 CET 2015


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f4a99656ce FULLPIPE: Fix bug with spring in scene04
76b71cabb9 FULLPIPE: Fix bug with unmovable jar in scene04


Commit: f4a99656ceab94cfc1c75d34180a5a49dfd43c0f
    https://github.com/scummvm/scummvm/commit/f4a99656ceab94cfc1c75d34180a5a49dfd43c0f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-01-02T13:15:13+01:00

Commit Message:
FULLPIPE: Fix bug with spring in scene04

Changed paths:
    engines/fullpipe/scenes/scene04.cpp



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index fd1ecec..6b3ddf9 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -949,7 +949,7 @@ void sceneHandler04_springWobble() {
 	if (g_vars->scene04_bottleWeight < newdelta)
 		g_vars->scene04_springOffset--;
 
-	if ((oldDynIndex > g_vars->scene04_bottleWeight && newdelta > g_vars->scene04_bottleWeight) || newdelta <= g_vars->scene04_bottleWeight) {
+	if ((oldDynIndex <= g_vars->scene04_bottleWeight && newdelta > g_vars->scene04_bottleWeight) || newdelta <= g_vars->scene04_bottleWeight) {
 		g_vars->scene04_springDelay++;
 
 		if (g_vars->scene04_springOffset && g_vars->scene04_springDelay > 1) {


Commit: 76b71cabb9946b443afc803d04b1ca9e71cf5143
    https://github.com/scummvm/scummvm/commit/76b71cabb9946b443afc803d04b1ca9e71cf5143
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-01-02T13:15:13+01:00

Commit Message:
FULLPIPE: Fix bug with unmovable jar in scene04

Changed paths:
    engines/fullpipe/scenes/scene04.cpp



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 6b3ddf9..4a87ae5 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() {






More information about the Scummvm-git-logs mailing list