From 3805362275cd5764b5dd3c15e94dfee9cff9ba44 Mon Sep 17 00:00:00 2001
From: Retro-Junk
Date: Mon, 29 Aug 2016 15:42:42 +0300
Subject: FULLPIPE: Scene04: Stop the Jar from levitating

---
 engines/fullpipe/scenes/scene04.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/fullpipe/scenes')

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index d901d74289..b6239c219f 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) {
-- 
cgit v1.2.3