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

[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:
73ec0a71ab FULLPIPE: Implement sceneHandler04_sub12()
dc367d11e9 FULLPIPE: Started implementation of sceneHandler04_sub17()


Commit: 73ec0a71ab022e5aeb3f54f4604aeee0ae7e6b74
    https://github.com/scummvm/scummvm/commit/73ec0a71ab022e5aeb3f54f4604aeee0ae7e6b74
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-02T11:58:53-08:00

Commit Message:
FULLPIPE: Implement sceneHandler04_sub12()

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index d642ebf..7f6ac8e 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -433,6 +433,16 @@ void sceneHandler04_sub9(StaticANIObject *ani) {
 	warning("sceneHandler04_sub9()");
 }
 
+void sceneHandler04_sub12() {
+	StaticANIObject *ball =  g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_BIGBALL, -1);
+
+	if (ball && ball->_flags & 4)
+		for (uint i = 0; i < ball->_movements.size(); i++)
+			((Movement *)ball->_movements[i])->_counterMax = 0;
+
+	g_vars->scene04_var13 = 0;
+}
+
 void sceneHandler04_sub15() {
 	warning("sceneHandler04_sub15()");
 }


Commit: dc367d11e9dde463a8a48246e47f6650d205a7e1
    https://github.com/scummvm/scummvm/commit/dc367d11e9dde463a8a48246e47f6650d205a7e1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-02T12:07:45-08:00

Commit Message:
FULLPIPE: Started implementation of sceneHandler04_sub17()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 76739b6..b7ab84e 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -184,6 +184,8 @@ namespace Fullpipe {
 #define PIC_SC4_MASK 585
 #define PIC_SC4_PLANK 5183
 #define PIC_SCD_SEL 734
+#define QU_BALL_WALKL 4920
+#define QU_BALL_WALKR 4919
 #define QU_EGTR_MD2_SHOW 4698
 #define QU_EGTR_MD1_SHOW 4697
 #define QU_EGTR_SLIMSHOW 4883
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 7f6ac8e..311bf86 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -448,6 +448,28 @@ void sceneHandler04_sub15() {
 }
 
 void sceneHandler04_sub17() {
+#if 0
+	StaticANIObject *ball =  g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_BIGBALL, -1);
+
+	if (g_vars->scene04_var01
+		 && (!ball || !(ball->_flags & 4))
+		 && g_vars->scene04_ladder->collisionDetection(g_fullpipe->_aniMan) > 3) {
+
+		if (!g_fullpipe->_rnd->getRandomNumber(49)) {
+			if (g_vars->scene04_var15)
+				chainQueue(QU_BALL_WALKR, 0);
+			else
+				chainQueue(QU_BALL_WALKL, 0);
+
+			g_vars->scene04_var15 = !g_vars->scene04_var15;
+
+			sceneHandler04_checkBigBallClick();
+
+			g_vars->scene04_var14 = 0;
+		}
+	}
+#endif
+
 	warning("sceneHandler04_sub17()");
 }