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

[sev-]

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:
2236ae1055 FULLPIPE: Implement sceneHandler18and19_showManJump()
a3db3230b2 FULLPIPE: Implement sceneHandler18and19_boyJumpTo()
d22d20077b FULLPIPE: Implement sceneHandler19_updateNumRides()


Commit: 2236ae10552201ef37c373db2164b3e408d821b1
    https://github.com/scummvm/scummvm/commit/2236ae10552201ef37c373db2164b3e408d821b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-06T13:01:39-08:00

Commit Message:
FULLPIPE: Implement sceneHandler18and19_showManJump()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index f07a1db..60349c9 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -887,6 +887,7 @@ namespace Fullpipe {
 #define MSG_SC18_SHOWGIRLJUMPTO 1499
 #define MSG_SC18_SHOWMANJUMP 1510
 #define MSG_SC18_SHOWMANJUMPTO 1508
+#define MV_KSL_INMAN 1504
 #define MV_KSL_SWING 1460
 #define MV_KSL_SWINGBOY 1462
 #define MV_KSL_SWINGGIRL 1464
@@ -898,6 +899,7 @@ namespace Fullpipe {
 #define PIC_SC18_RTRUBA 1520
 #define SND_18_006 3906
 #define SND_18_010 4994
+#define ST_KSL_JUMPMAN 1505
 
 // Scene 19
 #define ANI_CORDIE 1529
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index e950785..1cc0399 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -389,7 +389,19 @@ void sceneHandler18_clickBoard() {
 }
 
 void sceneHandler18and19_showManJump() {
-	warning("STUB: sceneHandler18and19_showManJump()");
+	g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT);
+	g_fp->_aniMan->_flags &= 0xFFFB;
+	g_fp->_aniMan->_flags &= 0xFEFF;
+	g_vars->scene18_var07[g_vars->scene18_var27]->sflags = 0x20;
+
+	g_vars->scene18_var07[g_vars->scene18_var27]->ani->changeStatics2(ST_KSL_JUMPMAN);
+	g_vars->scene18_var07[g_vars->scene18_var27]->ani->startAnim(MV_KSL_INMAN, 0, -1);
+	g_vars->scene18_var07[g_vars->scene18_var27]->ani->_priority = 20;
+
+	g_vars->scene18_var28 = 0;
+	g_vars->scene18_var15 = 1;
+
+	g_fp->_aniMan2 = g_vars->scene18_var07[g_vars->scene18_var27]->ani;
 }
 
 void sceneHandler18_showManJumpTo() {


Commit: a3db3230b22b359d9d4ec2b331bf91850f50eb3e
    https://github.com/scummvm/scummvm/commit/a3db3230b22b359d9d4ec2b331bf91850f50eb3e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-06T13:01:39-08:00

Commit Message:
FULLPIPE: Implement sceneHandler18and19_boyJumpTo()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 60349c9..33ae1e5 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -887,6 +887,7 @@ namespace Fullpipe {
 #define MSG_SC18_SHOWGIRLJUMPTO 1499
 #define MSG_SC18_SHOWMANJUMP 1510
 #define MSG_SC18_SHOWMANJUMPTO 1508
+#define MV_BOY18_JUMPTO 1481
 #define MV_KSL_INMAN 1504
 #define MV_KSL_SWING 1460
 #define MV_KSL_SWINGBOY 1462
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 1cc0399..cc34cff 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -424,6 +424,13 @@ void sceneHandler18and19_showBoyJump() {
 	warning("STUB: sceneHandler18and19_showBoyJump()");
 }
 
+void sceneHandler18and19_boyJumpTo() {
+	g_vars->scene18_boy->stopAnim_maybe();
+	g_vars->scene18_boy->show1(g_vars->scene18_var29, g_vars->scene18_var30, MV_BOY18_JUMPTO, 0);
+	g_vars->scene18_boy->_priority = 50;
+	g_vars->scene18_boy->startAnim(MV_BOY18_JUMPTO, 0, -1);
+}
+
 void sceneHandler18and19_drawRiders() {
 	warning("STUB: sceneHandler18and19_drawRiders()");
 }


Commit: d22d20077b15e9d45a5892380681380d4f84fd3d
    https://github.com/scummvm/scummvm/commit/d22d20077b15e9d45a5892380681380d4f84fd3d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-06T13:01:39-08:00

Commit Message:
FULLPIPE: Implement sceneHandler19_updateNumRides()

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



diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index cc34cff..ea816bb 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -555,7 +555,18 @@ int sceneHandler18(ExCommand *cmd) {
 }
 
 void sceneHandler19_updateNumRides() {
-	warning("STUB: sceneHandler19_updateNumRides()");
+	int numRides = g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarAsInt(sO_DudeSwinged) + 1;
+
+	if (numRides > 1) {
+		g_fp->setObjectState(sO_Girl, g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging));
+
+		g_vars->scene18_var23 = 1;
+		g_vars->scene18_var25++;
+
+		numRides = 0;
+	}
+
+	g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->setSubVarAsInt(sO_DudeSwinged, numRides);
 }
 
 int sceneHandler19(ExCommand *cmd) {