[Scummvm-cvs-logs] scummvm master -> fe08d06c8a7c7ff689c12e2bc29c676a5e88505a

sev- sev at scummvm.org
Sun Dec 8 23:33:51 CET 2013


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:
21aba3a26e FULLPIPE: Properly mark stubs in scene04
fe08d06c8a FULLPIPE: Initial work on sceneHandler04_sub4()


Commit: 21aba3a26e26765d395ddb1ea5e1ef02b0e6f5c7
    https://github.com/scummvm/scummvm/commit/21aba3a26e26765d395ddb1ea5e1ef02b0e6f5c7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-08T14:32:43-08:00

Commit Message:
FULLPIPE: Properly mark stubs in scene04

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 89e6fc3..21e7b23 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -245,7 +245,7 @@ int scene04_updateCursor() {
 }
 
 void sceneHandlers_sub01(ExCommand *ex) {
-	warning("sceneHandlers_sub01()");
+	warning("STUB: sceneHandlers_sub01()");
 }
 
 void sceneHandler04_checkBigBallClick() {
@@ -279,7 +279,7 @@ void sceneHandler04_clickButton() {
 }
 
 void sceneHandler04_clickLadder() {
-	warning("sceneHandler04_clickLadder()");
+	warning("STUB: sceneHandler04_clickLadder()");
 }
 
 void sceneHandler04_jumpOnLadder() {
@@ -358,7 +358,7 @@ void sceneHandler04_dropBottle() {
 }
 
 void sceneHandler04_gotoLadder(int par) {
-	warning("sceneHandler04_gotoLadder()");
+	warning("STUB: sceneHandler04_gotoLadder()");
 }
 
 void sceneHandler04_lowerPlank() {
@@ -395,7 +395,7 @@ void sceneHandler04_raisePlank() {
 }
 
 void sceneHandler04_shootKozyawka() {
-	warning("sceneHandler04_shootKozyawka()");
+	warning("STUB: sceneHandler04_shootKozyawka()");
 }
 
 void sceneHandler04_showCoin() {
@@ -409,7 +409,7 @@ void sceneHandler04_showCoin() {
 }
 
 void sceneHandler04_stopSound() {
-	warning("sceneHandler04_stopSound()");
+	warning("STUB: sceneHandler04_stopSound()");
 }
 
 void sceneHandler04_sub1(ExCommand *ex) {
@@ -442,11 +442,11 @@ void sceneHandler04_walkKozyawka() {
 }
 
 void sceneHandler04_sub4() {
-	warning("sceneHandler04_sub4()");
+	warning("STUB: sceneHandler04_sub4()");
 }
 
 void sceneHandler04_sub5() {
-	warning("sceneHandler04_sub5()");
+	warning("STUB: sceneHandler04_sub5()");
 }
 
 void sceneHandler04_bottleUpdateObjects(int off) {
@@ -499,7 +499,7 @@ void sceneHandler04_goClock() {
 }
 
 void sceneHandler04_sub8(ExCommand *ex) {
-	warning("sceneHandler04_sub8()");
+	warning("STUB: sceneHandler04_sub8()");
 }
 
 void sceneHandler04_sub12() {


Commit: fe08d06c8a7c7ff689c12e2bc29c676a5e88505a
    https://github.com/scummvm/scummvm/commit/fe08d06c8a7c7ff689c12e2bc29c676a5e88505a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-08T14:32:43-08:00

Commit Message:
FULLPIPE: Initial work on sceneHandler04_sub4()

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 21e7b23..3c2c022 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -442,6 +442,73 @@ void sceneHandler04_walkKozyawka() {
 }
 
 void sceneHandler04_sub4() {
+#if 0
+	int var20 = g_vars->scene04_var20;
+	int oldDynIndex = g_vars->scene04_dynamicPhaseIndex;
+	v2 = 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;
+		var20 = 0;
+		g_vars->scene04_dynamicPhaseIndex = 0;
+		g_vars->scene04_var20 = 0;
+	}
+
+	if (v2 > 14) {
+		v2 = 14;
+		var20 = 0;
+		g_vars->scene04_dynamicPhaseIndex = 14;
+		g_vars->scene04_var20 = 0;
+	}
+
+	v4 = __OFSUB__(g_vars->scene04_var06, v2);
+	v3 = g_vars->scene04_var06 - v2 < 0;
+
+	if (g_vars->scene04_var06 > v2) {
+		++var20;
+		v4 = __OFSUB__(g_vars->scene04_var06, v2);
+		v3 = g_vars->scene04_var06 - v2 < 0;
+		g_vars->scene04_var20 = var20;
+	}
+
+	if (v3 ^ v4) {
+		--var20;
+		g_vars->scene04_var20 = var20;
+	}
+
+	if (oldDynIndex <= g_vars->scene04_var06)
+		if (v2 <= g_vars->scene04_var06)
+			goto LABEL_16;
+	} else if (v2 > g_vars->scene04_var06) {
+		goto LABEL_16;
+	}
+
+	g_vars->scene04_var25++;
+
+	if (var20 && g_vars->scene04_var25 > 1) {
+		g_vars->scene04_var25 = 0;
+		g_vars->scene04_var20--;
+	}
+ LABEL_16:
+
+	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);
+
+		g_vars->scene04_spring->_movement->setDynamicPhaseIndex(g_vars->scene04_dynamicPhaseIndex);
+	} else {
+		g_vars->scene04_spring->changeStatics2(ST_SPR_UP);
+	}
+
+	if (g_vars->scene04_dynamicPhaseIndex != oldDynIndex)
+		sceneHandler04_bottleUpdateObjects(curdelta - (g_vars->scene04_spring->getCurrDimensions(&point)->y - g_vars->scene04_dynamicPhaseIndex));
+#endif
+
 	warning("STUB: sceneHandler04_sub4()");
 }
 






More information about the Scummvm-git-logs mailing list