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

[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:
2a81fb5e1e FULLPIPE: Implement sceneHandler18_showManJumpTo()
baa4457f25 FULLPIPE: Implement sceneHandler18_clickBoard()


Commit: 2a81fb5e1e429f0fc2d6a1ad05fc814747a355f5
    https://github.com/scummvm/scummvm/commit/2a81fb5e1e429f0fc2d6a1ad05fc814747a355f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-12T23:33:12+02:00

Commit Message:
FULLPIPE: Implement sceneHandler18_showManJumpTo()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 62f344e..9062fe9 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -902,6 +902,7 @@ namespace Fullpipe {
 #define MV_KSL_SWINGBOY 1462
 #define MV_KSL_SWINGGIRL 1464
 #define MV_KSL_SWINGMAN 1502
+#define MV_MAN18_JUMPTOTRUBA 1511
 #define MV_MAN18_STANDKRESLO 1500
 #define MV_WHR18_SPIN 1300
 #define PIC_SC18_DOMIN 5184
@@ -909,6 +910,9 @@ namespace Fullpipe {
 #define PIC_SC18_LADDER2 1472
 #define PIC_SC18_LADDER3 3299
 #define PIC_SC18_RTRUBA 1520
+#define QU_SC19_MANJUMP1 1516
+#define QU_SC19_MANJUMP2 1517
+#define QU_SC19_MANJUMP3 1518
 #define SND_18_006 3906
 #define SND_18_010 4994
 #define ST_KSL_BOY 1463
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 1fb0f2e..76b1181 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -408,7 +408,43 @@ void sceneHandler18and19_showManJump() {
 }
 
 void sceneHandler18_showManJumpTo() {
-	warning("STUB: sceneHandler18_showManJumpTo()");
+	int x, y;
+
+	if (g_vars->scene18_var07[g_vars->scene18_var31]->ani->_movement) {
+		x = g_vars->scene18_var07[g_vars->scene18_var31]->ani->_movement->_ox;
+		y = g_vars->scene18_var07[g_vars->scene18_var31]->ani->_movement->_oy;
+	} else {
+		x = g_vars->scene18_var07[g_vars->scene18_var31]->ani->_ox;
+		y = g_vars->scene18_var07[g_vars->scene18_var31]->ani->_oy;
+	}
+
+	g_fp->_aniMan->show1(x + 62, y + 5, MV_MAN18_JUMPTOTRUBA, 0);
+	g_fp->_aniMan->_priority = 35;
+
+	int mqid = 0;
+
+	if (g_vars->scene18_var13 == 1) {
+		mqid = QU_SC19_MANJUMP1;
+	} else if (g_vars->scene18_var13 == 2) {
+		mqid = QU_SC19_MANJUMP2;
+	} else if (g_vars->scene18_var13 == 3) {
+		mqid = QU_SC19_MANJUMP3;
+	}
+
+	if (mqid) {
+		MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(mqid), 0, 0);
+
+		g_fp->_aniMan2 = g_fp->_aniMan;
+		g_vars->scene18_var15 = 0;
+
+		mq->setFlags(mq->getFlags() | 1);
+		mq->chain(0);
+	}
+
+	g_vars->scene18_var07[g_vars->scene18_var31]->sflags = 1;
+
+	g_vars->scene18_var07[g_vars->scene18_var31]->ani->changeStatics2(ST_KSL_NORM);
+	g_vars->scene18_var07[g_vars->scene18_var31]->ani->_priority = 30;
 }
 
 void sceneHandler18and19_showGirlJumpTo() {


Commit: baa4457f257faa89b0c92cb0a7854839fc4f82ee
    https://github.com/scummvm/scummvm/commit/baa4457f257faa89b0c92cb0a7854839fc4f82ee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-12T23:33:12+02:00

Commit Message:
FULLPIPE: Implement sceneHandler18_clickBoard()

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



diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 76b1181..d17b5d1 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -388,7 +388,18 @@ int scene19_updateCursor() {
 }
 
 void sceneHandler18_clickBoard() {
-	warning("STUB: sceneHandler18_clickBoard()");
+	if (ABS(967 - g_fp->_aniMan->_ox) > 1 || ABS(379 - g_fp->_aniMan->_oy) > 1 || g_fp->_aniMan->_statics->_staticsId != ST_MAN_RIGHT) {
+		MessageQueue *mq = getCurrSceneSc2MotionController()->method34(g_fp->_aniMan, 967, 379, 1, ST_MAN_RIGHT);
+		ExCommand *ex = new ExCommand(0, 17, MSG_SC18_MANREADY, 0, 0, 0, 1, 0, 0, 0);
+
+		ex->_excFlags = 2;
+
+		mq->addExCommandToEnd(ex);
+
+		postExCommand(g_fp->_aniMan->_id, 2, 967, 379, 0, -1);
+	} else {
+		g_vars->scene18_var28 = 1;
+	}
 }
 
 void sceneHandler18and19_showManJump() {