aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-01-13 20:51:29 +0200
committerEugene Sandulenko2014-01-13 20:51:29 +0200
commitcf978529c86fe78da295d79ba5193f6994b58cd2 (patch)
tree365b7958624665f801f056b51567d92a45fb8437
parent063d008e7296e16ddf85628da62265875bac0120 (diff)
downloadscummvm-rg350-cf978529c86fe78da295d79ba5193f6994b58cd2.tar.gz
scummvm-rg350-cf978529c86fe78da295d79ba5193f6994b58cd2.tar.bz2
scummvm-rg350-cf978529c86fe78da295d79ba5193f6994b58cd2.zip
FULLPIPE: More code to scene34
-rw-r--r--engines/fullpipe/constants.h2
-rw-r--r--engines/fullpipe/scenes/scene34.cpp13
2 files changed, 11 insertions, 4 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 5cb6668c61..cfd0dc6edb 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 ffb4ffab82..86b9994b0f 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() {