[Scummvm-cvs-logs] scummvm master -> 185cf9ea3c3b40d88baeadae9f7e65f842d3596d

[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:
d39b2280f2 FULLPIPE: Simplify scene04_springWobble()
185cf9ea3c FULLPIPE: Add calls to callback1 in Movement::gotoNextFrame()


Commit: d39b2280f2bd4bc5b1dccb9f77b10b82479154e5
    https://github.com/scummvm/scummvm/commit/d39b2280f2bd4bc5b1dccb9f77b10b82479154e5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-11T11:40:25-08:00

Commit Message:
FULLPIPE: Simplify scene04_springWobble()

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index a797939..5006121 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -473,20 +473,14 @@ void sceneHandler04_springWobble() {
 	if (g_vars->scene04_bottleWeight < newdelta)
 		g_vars->scene04_var20--;
 
-	if (oldDynIndex <= g_vars->scene04_bottleWeight) {
-		if (newdelta <= g_vars->scene04_bottleWeight)
-			goto LABEL_16;
-	} else if (newdelta > g_vars->scene04_bottleWeight) {
-		goto LABEL_16;
-	}
-
-	g_vars->scene04_var25++;
+	if ((oldDynIndex > g_vars->scene04_bottleWeight && newdelta > g_vars->scene04_bottleWeight) || newdelta <= g_vars->scene04_bottleWeight) {
+		g_vars->scene04_var25++;
 
-	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 / abs(g_vars->scene04_var20);
+		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 / abs(g_vars->scene04_var20);
+		}
 	}
- LABEL_16:
 
 	Common::Point point;
 


Commit: 185cf9ea3c3b40d88baeadae9f7e65f842d3596d
    https://github.com/scummvm/scummvm/commit/185cf9ea3c3b40d88baeadae9f7e65f842d3596d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-11T11:41:00-08:00

Commit Message:
FULLPIPE: Add calls to callback1 in Movement::gotoNextFrame()

Changed paths:
    engines/fullpipe/statics.cpp
    engines/fullpipe/statics.h



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 8324e0f..b97e7f8 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1570,7 +1570,7 @@ void Movement::removeFirstPhase() {
 	_updateFlag1 = 0;
 }
 
-bool Movement::gotoNextFrame(int callback1, void (*callback2)(int *)) {
+bool Movement::gotoNextFrame(void (*callback1)(int, Common::Point *point, int, int), void (*callback2)(int *)) {
 	debug(8, "Movement::gotoNextFrame()");
 
 	if (!callback2) {
@@ -1622,7 +1622,7 @@ bool Movement::gotoNextFrame(int callback1, void (*callback2)(int *)) {
 		if (_currMovement->_framePosOffsets) {
 			if (callback1) {
 				point = *_currMovement->_framePosOffsets[_currDynamicPhaseIndex];
-				//callback1(_currDynamicPhaseIndex, &point, _ox, _oy);
+				callback1(_currDynamicPhaseIndex, &point, _ox, _oy);
 
 				_ox += deltax - point.x;
 				_oy += point.y;
diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h
index 15de4ab..c8537df 100644
--- a/engines/fullpipe/statics.h
+++ b/engines/fullpipe/statics.h
@@ -155,7 +155,7 @@ class Movement : public GameObject {
 	int calcDuration();
 
 	void removeFirstPhase();
-	bool gotoNextFrame(int callback1, void (*callback2)(int *));
+	bool gotoNextFrame(void (*_callback1)(int, Common::Point *point, int, int), void (*callback2)(int *));
 	bool gotoPrevFrame();
 	void gotoFirstFrame();
 	void gotoLastFrame();
@@ -174,7 +174,7 @@ class StaticANIObject : public GameObject {
 	int16 _field_32;
 	int _field_34;
 	int _initialCounter;
-	int _callback1;
+	void (*_callback1)(int, Common::Point *point, int, int);
 	void (*_callback2)(int *);
 	PtrList _movements;
 	PtrList _staticsList;