aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-01-02 00:16:36 +0200
committerEugene Sandulenko2014-01-02 00:48:34 +0200
commit17d0be2fd1a635ca09b7b4bb7713e19b9c2dc099 (patch)
tree71e8527513ba7d701b63ba89da66692213ebdbb9
parent4b91d62d6459173b0d7046bbb7ad1a7106cd852e (diff)
downloadscummvm-rg350-17d0be2fd1a635ca09b7b4bb7713e19b9c2dc099.tar.gz
scummvm-rg350-17d0be2fd1a635ca09b7b4bb7713e19b9c2dc099.tar.bz2
scummvm-rg350-17d0be2fd1a635ca09b7b4bb7713e19b9c2dc099.zip
FULLPIPE: Implement sceneHandler17_testTruba() and sceneHandler17_updateFlies()
-rw-r--r--engines/fullpipe/constants.h1
-rw-r--r--engines/fullpipe/scenes/scene17.cpp13
2 files changed, 12 insertions, 2 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index ef3fa44034..c1a7487eb3 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -703,6 +703,7 @@ namespace Fullpipe {
#define MSG_SC17_SHOWSUGAR 1416
#define MSG_SC17_TESTTRUBA 1458
#define MSG_SC17_UPDATEHAND 1560
+#define MV_HND17_FIGA 1449
#define PIC_SC17_RTRUBA 1323
#define PIC_SC17_RTRUBA2 5297
#define QU_HND17_ASK 1456
diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/fullpipe/scenes/scene17.cpp
index 2b95c37afb..749d0d848d 100644
--- a/engines/fullpipe/scenes/scene17.cpp
+++ b/engines/fullpipe/scenes/scene17.cpp
@@ -77,7 +77,12 @@ void sceneHandler17_fillBottle() {
}
void sceneHandler17_testTruba() {
- warning("STUB: sceneHandler17_testTruba()");
+ if (g_vars->scene17_hand->isIdle()) {
+ if (!g_vars->scene17_hand->_movement || g_vars->scene17_hand->_movement->_id != MV_HND17_FIGA) {
+ g_vars->scene17_hand->changeStatics2(ST_HND17_EMPTY);
+ g_vars->scene17_hand->startAnim(MV_HND17_FIGA, 0, -1);
+ }
+ }
}
void sceneHandler17_showBottle() {
@@ -109,7 +114,11 @@ void sceneHandler17_moonshineFill() {
}
void sceneHandler17_updateFlies() {
- warning("STUB: sceneHandler17_updateFlies()");
+ g_fp->_floaters->genFlies(g_fp->_currentScene, 239, -50, 20, 4);
+
+ g_fp->_floaters->_array2[0]->countdown = g_fp->_rnd->getRandomNumber(5) + 6; // FIXME. Check
+ g_fp->_floaters->_array2[0]->val6 = 239;
+ g_fp->_floaters->_array2[0]->val7 = -50;
}