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

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bcc43d033a FULLPIPE: Implement sceneHandler18and19_showBoyJumpTo()


Commit: bcc43d033a691b12b29d77b3d51c49e087492152
    https://github.com/scummvm/scummvm/commit/bcc43d033a691b12b29d77b3d51c49e087492152
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-09T00:26:04+02:00

Commit Message:
FULLPIPE: Implement sceneHandler18and19_showBoyJumpTo()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 3c35f76..b919ccd 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -888,6 +888,7 @@ namespace Fullpipe {
 #define MSG_SC18_SHOWMANJUMP 1510
 #define MSG_SC18_SHOWMANJUMPTO 1508
 #define MV_BOY18_JUMPTO 1481
+#define MV_KSL_INBOY 1491
 #define MV_KSL_INGIRL 1493
 #define MV_KSL_INMAN 1504
 #define MV_KSL_SWING 1460
@@ -901,6 +902,7 @@ namespace Fullpipe {
 #define PIC_SC18_RTRUBA 1520
 #define SND_18_006 3906
 #define SND_18_010 4994
+#define ST_KSL_JUMPBOY 1492
 #define ST_KSL_JUMPGIRL 1494
 #define ST_KSL_JUMPMAN 1505
 
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 9623f20..8c03a8e 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -411,6 +411,7 @@ void sceneHandler18_showManJumpTo() {
 void sceneHandler18and19_showGirlJumpTo() {
 	g_vars->scene18_girl->stopAnim_maybe();
 	g_vars->scene18_girl->hide();
+
 	g_vars->scene18_var07[g_vars->scene18_var33]->sflags = 4;
 
 	g_vars->scene18_var07[g_vars->scene18_var33]->ani->changeStatics2(ST_KSL_JUMPGIRL);
@@ -425,7 +426,15 @@ void sceneHandler18and19_showGirlJump() {
 }
 
 void sceneHandler18and19_showBoyJumpTo() {
-	warning("STUB: sceneHandler18and19_showBoyJumpTo()");
+	g_vars->scene18_boy->stopAnim_maybe();
+	g_vars->scene18_boy->hide();
+
+	g_vars->scene18_var07[g_vars->scene18_var33]->sflags = 2;
+	g_vars->scene18_var07[g_vars->scene18_var33]->ani->changeStatics2(ST_KSL_JUMPBOY);
+	g_vars->scene18_var07[g_vars->scene18_var33]->ani->startAnim(MV_KSL_INBOY, 0, -1);
+
+	g_vars->scene18_var23--;
+	g_vars->scene18_var24--;
 }
 
 void sceneHandler18and19_showBoyJump() {