[Scummvm-cvs-logs] scummvm master -> 51d8365232788704f1bda46d8f2671c4c835a866

sev- sev at scummvm.org
Wed Dec 11 13:31:16 CET 2013


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

Summary:
8626ef3d3e FULLPIPE: Bugfix sceneHandler04_springWobble()
d951c2aa97 FULLPIPE: More renames in scene04
51d8365232 FULLPIPE: Further fixes to sceneHandler04_springWobble()


Commit: 8626ef3d3e854bb1f4e79c3d1413fb9ef7003c51
    https://github.com/scummvm/scummvm/commit/8626ef3d3e854bb1f4e79c3d1413fb9ef7003c51
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-11T04:10:04-08:00

Commit Message:
FULLPIPE: Bugfix sceneHandler04_springWobble()

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 5e3429b..81b9a20 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -449,34 +449,34 @@ void sceneHandler04_bottleUpdateObjects(int off) {
 	}
 }
 
-void sceneHandler04_sub4() {
+void sceneHandler04_springWobble() {
 	int oldDynIndex = g_vars->scene04_dynamicPhaseIndex;
-	int v2 = g_vars->scene04_var20 + g_vars->scene04_dynamicPhaseIndex;
+	int newdelta = g_vars->scene04_var20 + g_vars->scene04_dynamicPhaseIndex;
 
 	g_vars->scene04_dynamicPhaseIndex += g_vars->scene04_var20;
 
-	if (g_vars->scene04_var20 + g_vars->scene04_dynamicPhaseIndex < 0) {
-		v2 = 0;
+	if (newdelta < 0) {
+		newdelta = 0;
 		g_vars->scene04_dynamicPhaseIndex = 0;
 		g_vars->scene04_var20 = 0;
 	}
 
-	if (v2 > 14) {
-		v2 = 14;
+	if (newdelta > 14) {
+		newdelta = 14;
 		g_vars->scene04_dynamicPhaseIndex = 14;
 		g_vars->scene04_var20 = 0;
 	}
 
-	if (g_vars->scene04_var06 > v2)
+	if (g_vars->scene04_var06 > newdelta)
 		g_vars->scene04_var20++;
 
-	if (g_vars->scene04_var06 < v2)
+	if (g_vars->scene04_var06 < newdelta)
 		g_vars->scene04_var20--;
 
 	if (oldDynIndex <= g_vars->scene04_var06) {
-		if (v2 <= g_vars->scene04_var06)
+		if (newdelta <= g_vars->scene04_var06)
 			goto LABEL_16;
-	} else if (v2 > g_vars->scene04_var06) {
+	} else if (newdelta > g_vars->scene04_var06) {
 		goto LABEL_16;
 	}
 
@@ -484,7 +484,7 @@ void sceneHandler04_sub4() {
 
 	if (g_vars->scene04_var20 && g_vars->scene04_var25 > 1) {
 		g_vars->scene04_var25 = 0;
-		g_vars->scene04_var20--;
+		g_vars->scene04_var20 = g_vars->scene04_var20 - g_vars->scene04_var20 / abs(g_vars->scene04_var20);
 	}
  LABEL_16:
 
@@ -813,7 +813,7 @@ int sceneHandler04(ExCommand *ex) {
 					g_fullpipe->_aniMan2 = g_fullpipe->_aniMan;
 			}
 
-			sceneHandler04_sub4();
+			sceneHandler04_springWobble();
 
 			if (g_vars->scene04_var07 && !g_vars->scene04_var09)
 				sceneHandler04_sub5();


Commit: d951c2aa97ff0126eea81c2fd3428470350c5893
    https://github.com/scummvm/scummvm/commit/d951c2aa97ff0126eea81c2fd3428470350c5893
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-11T04:22:21-08:00

Commit Message:
FULLPIPE: More renames in scene04

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index e4998e7..85d9423 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -83,7 +83,7 @@ Vars::Vars() {
 	scene04_var02 = 0;
 	scene04_var04 = 0;
 	scene04_walkingKozyawka = 0;
-	scene04_var06 = 0;
+	scene04_bottleWeight = 0;
 	scene04_var07 = 0;
 	scene04_var08 = 0;
 	scene04_var09 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index e3edebf..abe01cb 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -115,7 +115,7 @@ public:
 
 	int scene04_var02;
 	int scene04_var04;
-	int scene04_var06;
+	int scene04_bottleWeight;
 	int scene04_var07;
 	int scene04_var08;
 	int scene04_var09;
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 81b9a20..b612c0f 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -164,7 +164,7 @@ void scene04_initScene(Scene *sc) {
 	g_vars->scene04_soundPlaying = false;
 	g_vars->scene04_var04 = 0;
 	g_vars->scene04_walkingKozyawka = 0;
-	g_vars->scene04_var06 = 2;
+	g_vars->scene04_bottleWeight = 2;
 	g_vars->scene04_dynamicPhaseIndex = 0;
 
 	g_vars->scene04_kozyawkiAni.clear();
@@ -333,7 +333,7 @@ void sceneHandler04_clickPlank() {
 void sceneHandler04_dropBottle() {
 	g_vars->scene04_var12 = 1;
 	g_vars->scene04_bottleY = 10;
-	g_vars->scene04_var06 = 0;
+	g_vars->scene04_bottleWeight = 0;
 
 	while (g_vars->scene04_kozyawkiAni.size()) {
 		StaticANIObject *koz = g_vars->scene04_kozyawkiAni.front();
@@ -369,7 +369,7 @@ void sceneHandler04_manFromBottle() {
 	for (Common::List<GameObject *>::iterator it = g_vars->scene04_bottleObjList.begin(); it != g_vars->scene04_bottleObjList.end(); ++it)
 		if (*it == g_fullpipe->_aniMan) {
 			g_vars->scene04_bottleObjList.erase(it);
-			g_vars->scene04_var06 -= 9;
+			g_vars->scene04_bottleWeight -= 9;
 			break;
 		}
 
@@ -385,7 +385,7 @@ void sceneHandler04_manFromBottle() {
 void sceneHandler04_manToBottle() {
 	g_vars->scene04_bottleObjList.push_back(g_fullpipe->_aniMan);
 	g_vars->scene04_var20 = 5;
-	g_vars->scene04_var06 += 9;
+	g_vars->scene04_bottleWeight += 9;
 	g_fullpipe->_aniMan2 = g_fullpipe->_aniMan;
 	g_vars->scene04_var10 = 1;
 }
@@ -467,16 +467,16 @@ void sceneHandler04_springWobble() {
 		g_vars->scene04_var20 = 0;
 	}
 
-	if (g_vars->scene04_var06 > newdelta)
+	if (g_vars->scene04_bottleWeight > newdelta)
 		g_vars->scene04_var20++;
 
-	if (g_vars->scene04_var06 < newdelta)
+	if (g_vars->scene04_bottleWeight < newdelta)
 		g_vars->scene04_var20--;
 
-	if (oldDynIndex <= g_vars->scene04_var06) {
-		if (newdelta <= g_vars->scene04_var06)
+	if (oldDynIndex <= g_vars->scene04_bottleWeight) {
+		if (newdelta <= g_vars->scene04_bottleWeight)
 			goto LABEL_16;
-	} else if (newdelta > g_vars->scene04_var06) {
+	} else if (newdelta > g_vars->scene04_bottleWeight) {
 		goto LABEL_16;
 	}
 
@@ -525,7 +525,7 @@ void sceneHandler04_liftBottle() {
 		g_vars->scene04_var12 = 0;
 		g_vars->scene04_var09 = 0;
 		g_vars->scene04_var19 = 1;
-		g_vars->scene04_var06 = 2;
+		g_vars->scene04_bottleWeight = 2;
 		g_vars->scene04_var20 = 10;
 		g_vars->scene04_var02 = 0;
 
@@ -585,7 +585,7 @@ void sceneHandler04_sub9(StaticANIObject *ani) {
 	g_vars->scene04_bottleObjList.push_back(ani);
 	g_vars->scene04_kozyawkiAni.push_back(ani);
 
-	g_vars->scene04_var06 += 2;
+	g_vars->scene04_bottleWeight += 2;
 	g_vars->scene04_walkingKozyawka = 0;
 	g_vars->scene04_var24 = 0;
 
@@ -649,7 +649,7 @@ void sceneHandler04_takeKozyawka() {
 					break;
 				}
 
-			g_vars->scene04_var06 -= 2;
+			g_vars->scene04_bottleWeight -= 2;
 		}
 	}
 }


Commit: 51d8365232788704f1bda46d8f2671c4c835a866
    https://github.com/scummvm/scummvm/commit/51d8365232788704f1bda46d8f2671c4c835a866
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-11T04:30:31-08:00

Commit Message:
FULLPIPE: Further fixes to sceneHandler04_springWobble()

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index b612c0f..a797939 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -490,8 +490,6 @@ void sceneHandler04_springWobble() {
 
 	Common::Point point;
 
-	int curdelta = g_vars->scene04_spring->getCurrDimensions(point)->y - g_vars->scene04_dynamicPhaseIndex;
-
 	if (g_vars->scene04_dynamicPhaseIndex) {
 		if (!g_vars->scene04_spring->_movement)
 			g_vars->scene04_spring->startAnim(MV_SPR_LOWER, 0, -1);
@@ -502,7 +500,7 @@ void sceneHandler04_springWobble() {
 	}
 
 	if (g_vars->scene04_dynamicPhaseIndex != oldDynIndex)
-		sceneHandler04_bottleUpdateObjects(curdelta - (g_vars->scene04_spring->getCurrDimensions(point)->y - g_vars->scene04_dynamicPhaseIndex));
+		sceneHandler04_bottleUpdateObjects(oldDynIndex - g_vars->scene04_dynamicPhaseIndex);
 }
 
 void sceneHandler04_sub5() {






More information about the Scummvm-git-logs mailing list