[Scummvm-cvs-logs] scummvm master -> 3fb03efbe33fff3b83e0facc67e96e9253987fe5

[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:
bdd9931357 FULLPIPE: Implement sceneHandler06_enableDrops()
ce586cf836 FULLPIPE: More code to scene06
3fb03efbe3 FULLPIPE: Implement sceneHandler06_buttonPush()


Commit: bdd9931357bc7623c17d0fa606b2c854be771b64
    https://github.com/scummvm/scummvm/commit/bdd9931357bc7623c17d0fa606b2c854be771b64
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-17T00:08:20-08:00

Commit Message:
FULLPIPE: Implement sceneHandler06_enableDrops()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 1729c5a..3d9b0ba 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -253,6 +253,7 @@ namespace Fullpipe {
 #define QU_KOZAW_WALK 505
 #define QU_MOM_JUMPBK 671
 #define QU_MOM_JUMPFW 670
+#define QU_MOM_STANDUP 2899
 #define QU_PNK_CLICK 550
 #define QU_SC3_ENTERLIFT 2779
 #define QU_SC3_EXITLIFT 2808
@@ -261,6 +262,7 @@ namespace Fullpipe {
 #define QU_SC4_MANTOBOTTLE 2850
 #define QU_SC5_MANBUMP 1167
 #define QU_SC5_MANFLY 1168
+#define QU_SC6_DROPS 2898
 #define QU_SC6_ENTERLIFT 1054
 #define QU_SC6_EXITLIFT 1055
 #define SC_1 301
@@ -369,6 +371,7 @@ namespace Fullpipe {
 #define ST_MAN_STANDLADDER 453
 #define ST_MAN_UP 449
 #define ST_MAN6_BALL 2688
+#define ST_MOM_SITS 659
 #define ST_MOM_STANDS 658
 #define ST_NBL_NORM 1076
 #define ST_OTM_BOX_LEFT 429
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 76f61ff..a8ce227 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -77,7 +77,20 @@ void sceneHandler06_winArcade() {
 }
 
 void sceneHandler06_enableDrops() {
-	warning("STUB: sceneHandler06_enableDrops()");
+	chainQueue(QU_SC6_DROPS, 0);
+
+	g_vars->scene06_mumsy->changeStatics2(ST_MOM_SITS);
+	g_fullpipe->setObjectState(sO_BigMumsy, g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsPlaying));
+
+	chainQueue(QU_MOM_STANDUP, 1);
+
+	g_vars->scene06_var07 = 1;
+	g_vars->scene06_var12 = 0;
+	g_vars->scene06_mumsyPos = 0;
+	g_vars->scene06_var13 = 0;
+	g_vars->scene06_var16 = 0;
+
+	sceneHandler06_setExits(g_fullpipe->_currentScene);
 }
 
 void sceneHandler06_sub01() {


Commit: ce586cf836deb63b08db667d8faba72fb50e2fad
    https://github.com/scummvm/scummvm/commit/ce586cf836deb63b08db667d8faba72fb50e2fad
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-17T00:14:00-08:00

Commit Message:
FULLPIPE: More code to scene06

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 3d9b0ba..159b296 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -236,6 +236,7 @@ namespace Fullpipe {
 #define PIC_SC4_LRTRUBA 616
 #define PIC_SC4_MASK 585
 #define PIC_SC4_PLANK 5183
+#define PIC_SC6_LADDER 1104
 #define PIC_SCD_SEL 734
 #define QU_BALL_WALKL 4920
 #define QU_BALL_WALKR 4919
@@ -265,6 +266,7 @@ namespace Fullpipe {
 #define QU_SC6_DROPS 2898
 #define QU_SC6_ENTERLIFT 1054
 #define QU_SC6_EXITLIFT 1055
+#define QU_SC6_SHOWHANDLE 1689
 #define SC_1 301
 #define SC_10 653
 #define SC_11 654
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index a8ce227..ecccd78 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -102,7 +102,8 @@ void sceneHandler06_spinHandle() {
 }
 
 void sceneHandler06_uPipeClick() {
-	warning("STUB: sceneHandler06_uPipeClick()");
+	if (getGameLoaderInteractionController()->_flag24)
+		handleObjectInteraction(g_fullpipe->_aniMan2, g_fullpipe->_currentScene->getPictureObjectById(PIC_SC6_LADDER, 0), 0);
 }
 
 void sceneHandler06_buttonPush() {
@@ -114,7 +115,7 @@ void sceneHandler06_showNextBall() {
 }
 
 void sceneHandler06_installHandle() {
-	warning("STUB: sceneHandler06_installHandle()");
+	chainQueue(QU_SC6_SHOWHANDLE, 0);
 }
 
 void sceneHandler06_takeBall() {


Commit: 3fb03efbe33fff3b83e0facc67e96e9253987fe5
    https://github.com/scummvm/scummvm/commit/3fb03efbe33fff3b83e0facc67e96e9253987fe5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-17T00:23:24-08:00

Commit Message:
FULLPIPE: Implement sceneHandler06_buttonPush()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 159b296..6bd80a3 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -258,6 +258,7 @@ namespace Fullpipe {
 #define QU_PNK_CLICK 550
 #define QU_SC3_ENTERLIFT 2779
 #define QU_SC3_EXITLIFT 2808
+#define QU_SC6_FALLHANDLE 2995
 #define QU_SC4_GOCLOCK 595
 #define QU_SC4_MANFROMBOTTLE 2851
 #define QU_SC4_MANTOBOTTLE 2850
@@ -335,6 +336,7 @@ namespace Fullpipe {
 #define ST_EGTR_SLIM 336
 #define ST_HDL_BROKEN 3342
 #define ST_HDL_DOWN 625
+#define ST_HDL_PLUGGED 2397
 #define ST_HDL_UP 624
 #define ST_HND_EMPTY 603
 #define ST_IN1MAN_SLEEP 5112
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index ecccd78..73f38e4 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -107,7 +107,13 @@ void sceneHandler06_uPipeClick() {
 }
 
 void sceneHandler06_buttonPush() {
-	warning("STUB: sceneHandler06_buttonPush()");
+	g_vars->scene06_invHandle = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_INV_HANDLE, -1);
+
+	if (g_vars->scene06_invHandle)
+		if (g_vars->scene06_invHandle->_flags & 4)
+			if (g_vars->scene06_invHandle->_statics)
+				if (g_vars->scene06_invHandle->_statics->_staticsId == ST_HDL_PLUGGED)
+					chainQueue(QU_SC6_FALLHANDLE, 1);
 }
 
 void sceneHandler06_showNextBall() {