aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-01-10 00:13:41 +0200
committerEugene Sandulenko2014-01-10 00:42:21 +0200
commit9cddc195ce10eecbc45f7041897412450b1631f1 (patch)
tree99847587a39a9885feac8d0fa3e6201b8d383619
parent4d99ced17b21f14c7a76f29b5f6942108709fdc8 (diff)
downloadscummvm-rg350-9cddc195ce10eecbc45f7041897412450b1631f1.tar.gz
scummvm-rg350-9cddc195ce10eecbc45f7041897412450b1631f1.tar.bz2
scummvm-rg350-9cddc195ce10eecbc45f7041897412450b1631f1.zip
FULLPIPE: More code to scene33
-rw-r--r--engines/fullpipe/constants.h2
-rw-r--r--engines/fullpipe/scenes/scene33.cpp9
2 files changed, 9 insertions, 2 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 5f2b8fe93a..5381d0a8bf 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1119,7 +1119,9 @@ namespace Fullpipe {
#define MV_VNT33_TURNR 2641
#define PIC_SC33_LTRUBA 2618
#define PIC_SC33_ZONES 5298
+#define QU_KBK33_GO 4978
#define QU_KBK33_START 4983
+#define QU_SC33_STARTWATER 2644
#define ST_VNT33_DOWN 2640
#define ST_VNT33_RIGHT 2639
diff --git a/engines/fullpipe/scenes/scene33.cpp b/engines/fullpipe/scenes/scene33.cpp
index a5f2ea112c..e6b526ea14 100644
--- a/engines/fullpipe/scenes/scene33.cpp
+++ b/engines/fullpipe/scenes/scene33.cpp
@@ -103,7 +103,8 @@ void sceneHandler33_switchVent(StaticANIObject *ani) {
}
void sceneHandler33_tryCube() {
- warning("STUB: sceneHandler33_tryCube(");
+ if (g_fp->getObjectState(sO_Cube) == g_fp->getObjectEnumState(sO_Cube, sO_In_32))
+ chainQueue(QU_KBK33_GO, 0);
}
void sceneHandler33_pour() {
@@ -111,7 +112,11 @@ void sceneHandler33_pour() {
}
void sceneHandler33_handleDown() {
- warning("STUB: sceneHandler33_handleDown(");
+ if (!g_vars->scene33_var09 && !g_vars->scene33_jettie->_movement && !g_vars->scene33_jettie->getMessageQueue() ) {
+ chainQueue(QU_SC33_STARTWATER, 0);
+
+ g_vars->scene33_var09 = 1;
+ }
}
void sceneHandler33_zoneClickProcess(StaticANIObject *ani) {