[Scummvm-cvs-logs] scummvm master -> 50c98d9ee1910cf457e552f837bbda661f0dbd85

[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:
14590b4c68 FULLPIPE: Implement sceneHandler09_winArcade()
50c98d9ee1 FULLPIPE: More initializations in scene09


Commit: 14590b4c686b32f800c69419cc7b28a2294a5fc8
    https://github.com/scummvm/scummvm/commit/14590b4c686b32f800c69419cc7b28a2294a5fc8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-13T12:47:28-08:00

Commit Message:
FULLPIPE: Implement sceneHandler09_winArcade()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 05c917f..6fb8e65 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -599,10 +599,12 @@ namespace Fullpipe {
 #define MSG_SC9_SHOWBALL 936
 #define MSG_SC9_STARTTIOTIA 4942
 #define MSG_SC9_TOLADDER 4206
+#define MV_GLT_FLYAWAY 931
 #define MV_MAN9_SHOOT 922
 #define MV_VSN_CYCLE2 2987
 #define PIC_SC9_LADDER_R 2700
 #define SND_9_018 4200
+#define ST_GLT_SIT 926
 #define ST_GRT9_GRIT 2722
 #define ST_GRT9_NORM 2721
 #define ST_VSN_NORMAL 906
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index 1796d77..c0d68f9 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -238,7 +238,15 @@ int scene09_updateCursor() {
 }
 
 void sceneHandler09_winArcade() {
-	warning("STUB: sceneHandler09_winArcade()");
+	if (g_vars->scene09_glotatel->_flags & 4) {
+		g_vars->scene09_glotatel->changeStatics2(ST_GLT_SIT);
+		g_vars->scene09_glotatel->startAnim(MV_GLT_FLYAWAY, 0, -1);
+
+		g_fp->setObjectState(sO_Jug, g_fp->getObjectEnumState(sO_Jug, sO_Unblocked));
+		g_fp->setObjectState(sO_RightStairs_9, g_fp->getObjectEnumState(sO_RightStairs_9, sO_IsOpened));
+
+		g_vars->scene09_var08 = 0;
+	}
 }
 
 void sceneHandler09_startAuntie() {


Commit: 50c98d9ee1910cf457e552f837bbda661f0dbd85
    https://github.com/scummvm/scummvm/commit/50c98d9ee1910cf457e552f837bbda661f0dbd85
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-13T12:53:28-08:00

Commit Message:
FULLPIPE: More initializations in scene09

Changed paths:
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene09.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 118821e..96de144 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -172,6 +172,8 @@ Vars::Vars() {
 	scene09_var15 = 0;
 	scene09_var17 = 0;
 	scene09_var19 = 0;
+	scene09_var18.x = 0;
+	scene09_var18.y = -15;
 
 	scene10_gum = 0;
 	scene10_packet = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 7e1c45b..6b4c7e3 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -367,6 +367,7 @@ public:
 	int scene09_var15;
 	int scene09_var17;
 	int scene09_var19;
+	Common::Point scene09_var18;
 
 	StaticANIObject *scene10_gum;
 	StaticANIObject *scene10_packet;
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index c0d68f9..99086b8 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -69,6 +69,9 @@ void scene09_initScene(Scene *sc) {
 	g_vars->scene09_var11 = -1;
 	g_vars->scene09_var12 = -1000;
 
+	g_vars->scene09_balls.cPlexLen = 10;
+	g_vars->scene09_var07.cPlexLen = 10;
+
 	while (g_vars->scene09_balls.numBalls) {
 		Ball *b = g_vars->scene09_balls.pHead->p0;