[Scummvm-git-logs] scummvm master -> 3ff6dfee8bef8aa9af1a665d3131834883987ccd

[sev-]

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:
3805362275 FULLPIPE: Scene04: Stop the Jar from levitating
3ff6dfee8b FULLPIPE: Fix condition check in StaticANIObject::update


Commit: 3805362275cd5764b5dd3c15e94dfee9cff9ba44
    https://github.com/scummvm/scummvm/commit/3805362275cd5764b5dd3c15e94dfee9cff9ba44
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-29T15:06:21+02:00

Commit Message:
FULLPIPE: Scene04: Stop the Jar from levitating

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index d901d74..b6239c2 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -60,6 +60,10 @@ void scene04_speakerCallback(int *phase) {
 	}
 }
 
+void scene04_springCallback(int *phase) {
+	// do nothing
+}
+
 void scene04_initScene(Scene *sc) {
 	g_vars->scene04_dudeOnLadder = false;
 	g_vars->scene04_bottle = sc->getPictureObjectById(PIC_SC4_BOTTLE, 0);
@@ -127,7 +131,7 @@ void scene04_initScene(Scene *sc) {
 		StaticANIObject *spring = sc->getStaticANIObject1ById(ANI_SPRING, -1);
 
 		if (spring)
-			spring->_callback2 = 0;
+			spring->_callback2 = scene04_springCallback;
 
 		g_vars->scene04_bottleObjList.clear();
 		g_vars->scene04_bottleObjList.push_back(sc->getPictureObjectById(PIC_SC4_BOTTLE, 0));
@@ -949,7 +953,8 @@ 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)
+		|| (oldDynIndex > g_vars->scene04_bottleWeight && newdelta <= g_vars->scene04_bottleWeight)) {
 		g_vars->scene04_springDelay++;
 
 		if (g_vars->scene04_springOffset && g_vars->scene04_springDelay > 1) {


Commit: 3ff6dfee8bef8aa9af1a665d3131834883987ccd
    https://github.com/scummvm/scummvm/commit/3ff6dfee8bef8aa9af1a665d3131834883987ccd
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-29T15:06:29+02:00

Commit Message:
FULLPIPE: Fix condition check in StaticANIObject::update

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index e0fc1f6..ff079a8 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -833,7 +833,7 @@ void StaticANIObject::update(int counterdiff) {
 				}
 			}
 
-			if (dyn->_initialCountdown != dyn->_countdown || dyn->_field_68 == 0) {
+			if (dyn->_initialCountdown == dyn->_countdown && dyn->_field_68 != 0) {
 				newex = new ExCommand(_id, 17, dyn->_field_68, 0, 0, 0, 1, 0, 0, 0);
 				newex->_excFlags = 2;
 				newex->_keyCode = _okeyCode;