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

[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:
e752d38ac1 FULLPIPE: Implement sceneHandler18and19_showGirlJumpTo()


Commit: e752d38ac15360e78dd051e877785d6cc90fdcf6
    https://github.com/scummvm/scummvm/commit/e752d38ac15360e78dd051e877785d6cc90fdcf6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-08T00:22:00+02:00

Commit Message:
FULLPIPE: Implement sceneHandler18and19_showGirlJumpTo()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 33ae1e5..3c35f76 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_INGIRL 1493
 #define MV_KSL_INMAN 1504
 #define MV_KSL_SWING 1460
 #define MV_KSL_SWINGBOY 1462
@@ -900,6 +901,7 @@ namespace Fullpipe {
 #define PIC_SC18_RTRUBA 1520
 #define SND_18_006 3906
 #define SND_18_010 4994
+#define ST_KSL_JUMPGIRL 1494
 #define ST_KSL_JUMPMAN 1505
 
 // Scene 19
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 1c63693..0901593 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -290,6 +290,7 @@ Vars::Vars() {
 	scene18_var25 = 0;
 	scene18_var26 = 1;
 	scene18_var27 = -1;
+	scene18_var33 = 0;
 	scene18_var13 = -1;
 	scene18_var14 = -1;
 	scene18_var28 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 30306fa..7d67aab 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -494,6 +494,7 @@ public:
 	int scene18_var25;
 	int scene18_var26;
 	int scene18_var27;
+	int scene18_var33;
 	int scene18_var13;
 	int scene18_var14;
 	int scene18_var28;
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index ea816bb..9623f20 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -409,7 +409,15 @@ void sceneHandler18_showManJumpTo() {
 }
 
 void sceneHandler18and19_showGirlJumpTo() {
-	warning("STUB: 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);
+	g_vars->scene18_var07[g_vars->scene18_var33]->ani->startAnim(MV_KSL_INGIRL, 0, -1);
+
+	g_vars->scene18_var23--;
+	g_vars->scene18_var25--;
 }
 
 void sceneHandler18and19_showGirlJump() {