[Scummvm-cvs-logs] scummvm master -> 9d5f46c3660465f845f64b9e2643fdba79943c4d

sev- sev at scummvm.org
Tue Dec 31 20:16:55 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:
5679a26040 FULLPIPE: Implement sceneHandler14_startArcade()
0b2800f764 FULLPIPE: Implement sceneHandler14_showBallFly()
9d5f46c366 FULLPIPE: Implement sceneHandler14_showBallGrandmaHit()


Commit: 5679a260407b74492e03aace9f880733ab56ffce
    https://github.com/scummvm/scummvm/commit/5679a260407b74492e03aace9f880733ab56ffce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T11:16:10-08:00

Commit Message:
FULLPIPE: Implement sceneHandler14_startArcade()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 2b1d010..a2e2586 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -608,6 +608,7 @@ namespace Fullpipe {
 #define QU_SC14_ENDARCADE 1391
 #define QU_SC14_ENTERLIFT 1225
 #define QU_SC14_EXITLIFT 1226
+#define QU_SC14_STARTARCADE 1390
 
 // Scene 15
 #define ANI_BOOT_15 4779
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 31753b9..80fe623 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -222,6 +222,7 @@ Vars::Vars() {
 	scene14_var21 = 0;
 	scene14_var22 = 0;
 	scene14_var23 = 0;
+	scene14_var24 = 0;
 
 	scene15_chantingCountdown = 0;
 	scene15_plusminus = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index db7aa12..c84a671 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -298,6 +298,7 @@ public:
 	int scene14_var21;
 	int scene14_var22;
 	int scene14_var23;
+	int scene14_var24;
 
 	int scene15_chantingCountdown;
 	StaticANIObject *scene15_plusminus;
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 94b6d23f..0e9ddf2 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -201,7 +201,27 @@ void sceneHandler14_hideBallLast() {
 }
 
 void sceneHandler14_startArcade() {
-	warning("STUB: sceneHandler14_startArcade()");
+	g_vars->scene14_var03 = 1;
+	g_vars->scene14_var06 = 1;
+
+	if (g_fp->_aniMan->_movement) {
+		g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
+		g_fp->_aniMan->setOXY(1237, 451);
+		g_fp->_aniMan->_priority = 25;
+	}
+
+	getCurrSceneSc2MotionController()->clearEnabled();
+	getGameLoaderInteractionController()->disableFlag24();
+
+	g_fp->_aniMan2 = 0;
+	g_vars->scene14_var01 = 50;
+	g_vars->scene14_var07 = 100;
+	g_vars->scene14_var24 = 4;
+	g_vars->scene14_pink = 0;
+
+	chainQueue(QU_SC14_STARTARCADE, 0);
+
+	g_fp->_updateScreenCallback = sceneHandler14_updateScreenCallback;
 }
 
 void sceneHandler14_endArcade() {


Commit: 0b2800f76420f74a50a881426304acc46924d013
    https://github.com/scummvm/scummvm/commit/0b2800f76420f74a50a881426304acc46924d013
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T11:16:10-08:00

Commit Message:
FULLPIPE: Implement sceneHandler14_showBallFly()

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



diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 0e9ddf2..96d66e8 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -165,7 +165,42 @@ void sceneHandler14_manKickBall() {
 }
 
 void sceneHandler14_showBallFly() {
-	warning("STUB: sceneHandler14_showBallFly()");
+	if (g_vars->scene14_var11.size()) {
+		g_vars->scene14_var10 = g_vars->scene14_var11.front();
+		g_vars->scene14_var11.pop_front();
+	}
+
+	int x, y;
+
+	if (g_vars->scene14_grandma->_movement) {
+		x = g_vars->scene14_grandma->_movement->_ox;
+		g_vars->scene14_var22 = x;
+		y = g_vars->scene14_grandma->_movement->_oy;
+	} else {
+		x = g_vars->scene14_var16;
+		y = g_vars->scene14_var17;
+	}
+
+	x = x + 38;
+	y = y - 77;
+
+	g_vars->scene14_var20 = 32;
+
+	int dist = (g_vars->scene14_var14 - 16 - x) / 32;
+	int den = dist;
+
+	if (!dist)
+		den = 1;
+
+	g_vars->scene14_var22 = x + 32;
+	g_vars->scene14_var21 = (g_vars->scene14_var15 - 40 - dist * dist / 2 - y) / den;
+	g_vars->scene14_var23 = g_vars->scene14_var21 + y;
+
+	g_vars->scene14_var10->show1(x + 32, g_vars->scene14_var21 + y, MV_BAL14_SPIN, 0);
+	g_vars->scene14_var10->_priority = 5;
+	g_vars->scene14_var10->startAnim(MV_BAL14_SPIN, 0, -1);
+
+	g_vars->scene14_var05 = 1;
 }
 
 void sceneHandler14_grandmaJump() {


Commit: 9d5f46c3660465f845f64b9e2643fdba79943c4d
    https://github.com/scummvm/scummvm/commit/9d5f46c3660465f845f64b9e2643fdba79943c4d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T11:16:10-08:00

Commit Message:
FULLPIPE: Implement sceneHandler14_showBallGrandmaHit()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index a2e2586..5cfcc57 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -597,6 +597,7 @@ namespace Fullpipe {
 #define MSG_SC14_SHOWBALLMAN 1254
 #define MSG_SC14_STARTARCADE 3252
 #define MV_BAL14_SPIN 1247
+#define MV_BAL14_TOGMA 3214
 #define MV_MAN14_KICK 1237
 #define MV_MAN14_STEPFW 1240
 #define PIC_SC14_RTRUBA 1221
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 96d66e8..96abf35 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -137,7 +137,27 @@ void sceneHandler14_showBallGrandmaDive() {
 }
 
 void sceneHandler14_showBallGrandmaHit() {
-	warning("STUB: sceneHandler14_showBallGrandmaHit()");
+	if (g_vars->scene14_var10) {
+		g_vars->scene14_var10->show1(g_vars->scene14_var16 + 190, g_vars->scene14_var17 + 56, MV_BAL14_TOGMA, 0);
+		g_vars->scene14_var10->_priority = 27;
+
+		MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
+		ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_TOGMA, 0, 0, 0, 1, 0, 0, 0);
+
+		ex->_keyCode = g_vars->scene14_var10->_okeyCode;
+		ex->_excFlags |= 2;
+		ex->_field_24 = 1;
+		mq->addExCommandToEnd(ex);
+
+		ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0);
+		ex->_keyCode = g_vars->scene14_var10->_okeyCode;
+		ex->_excFlags |= 3;
+		mq->addExCommandToEnd(ex);
+		mq->chain(0);
+
+		g_vars->scene14_var11.push_back(g_vars->scene14_var10);
+		g_vars->scene14_var10 = 0;
+	}
 }
 
 void sceneHandler14_showBallMan() {






More information about the Scummvm-git-logs mailing list