[Scummvm-cvs-logs] scummvm master -> 523b3084808ead8d3841995c1740fd7ce6117736

[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:
cf978529c8 FULLPIPE: More code to scene34
523b308480 FULLPIPE: Yet more code to scene34


Commit: cf978529c86fe78da295d79ba5193f6994b58cd2
    https://github.com/scummvm/scummvm/commit/cf978529c86fe78da295d79ba5193f6994b58cd2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-13T10:51:29-08:00

Commit Message:
FULLPIPE: More code to scene34

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 5cb6668..cfd0dc6 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1157,10 +1157,12 @@ namespace Fullpipe {
 #define QU_SC34_ENTERLIFT 2819
 #define QU_SC34_EXITLIFT 2820
 #define QU_SC34_FROMCACTUS 4312
+#define QU_SC34_SHOWSTOOL 2496
 #define QU_CTS34_FALLEFT 4316
 #define QU_CTS34_FALLRIGHT 4317
 #define ST_CTS34_EMPTY 2383
 #define ST_CTS34_GROWNEMPTY2 2475
+#define ST_STL34_BOX2 4305
 
 // Scene 36
 #define ANI_SCISSORS_36 2647
diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp
index ffb4ffa..86b9994 100644
--- a/engines/fullpipe/scenes/scene34.cpp
+++ b/engines/fullpipe/scenes/scene34.cpp
@@ -113,11 +113,16 @@ void sceneHandler34_testVent() {
 }
 
 void sceneHandler34_hideStool() {
-	warning("STUB: sceneHandler34_hideStool()");
+	g_fp->_currentScene->getStaticANIObject1ById(ANI_STOOL_34, -1)->hide();
 }
 
 void sceneHandler34_climb() {
-	warning("STUB: sceneHandler34_climb()");
+	getCurrSceneSc2MotionController()->clearEnabled();
+	getGameLoaderInteractionController()->disableFlag24();
+
+	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 0);
+
+	g_vars->scene34_var05 = 1;
 }
 
 void sceneHandler34_sub04() {
@@ -162,11 +167,11 @@ void sceneHandler34_showVent() {
 }
 
 void sceneHandler34_showBox() {
-	warning("STUB: sceneHandler34_showBox()");
+	g_fp->_currentScene->getStaticANIObject1ById(ANI_STOOL_34, -1)->changeStatics2(ST_STL34_BOX2);
 }
 
 void sceneHandler34_showStool() {
-	warning("STUB: sceneHandler34_showStool()");
+	chainQueue(QU_SC34_SHOWSTOOL, 0);
 }
 
 void sceneHandler34_unclimb() {


Commit: 523b3084808ead8d3841995c1740fd7ce6117736
    https://github.com/scummvm/scummvm/commit/523b3084808ead8d3841995c1740fd7ce6117736
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-13T10:54:21-08:00

Commit Message:
FULLPIPE: Yet more code to scene34

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



diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp
index 86b9994..55217c9 100644
--- a/engines/fullpipe/scenes/scene34.cpp
+++ b/engines/fullpipe/scenes/scene34.cpp
@@ -101,11 +101,21 @@ int scene34_updateCursor() {
 }
 
 void sceneHandler34_leaveBoard() {
-	warning("STUB: sceneHandler34_leaveBoard()");
+	getCurrSceneSc2MotionController()->setEnabled();
+	getGameLoaderInteractionController()->enableFlag24();
+
+	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 1);
+
+	g_vars->scene34_var06 = 0;
 }
 
 void sceneHandler34_onBoard() {
-	warning("STUB: sceneHandler34_onBoard()");
+	getCurrSceneSc2MotionController()->clearEnabled();
+	getGameLoaderInteractionController()->disableFlag24();
+
+	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 0);
+
+	g_vars->scene34_var06 = 1;
 }
 
 void sceneHandler34_testVent() {
@@ -175,7 +185,12 @@ void sceneHandler34_showStool() {
 }
 
 void sceneHandler34_unclimb() {
-	warning("STUB: sceneHandler34_unclimb()");
+	getCurrSceneSc2MotionController()->setEnabled();
+	getGameLoaderInteractionController()->enableFlag24();
+
+	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 1);
+
+	g_vars->scene34_var05 = 0;
 }
 
 int sceneHandler34(ExCommand *cmd) {