FULLPIPE: Implement sceneHandler17_testTruba() and sceneHandler17_upd…

…ateFlies()
scummvm · Jan 1, 2014 · 17d0be2 · 17d0be2
1 parent 4b91d62
commit 17d0be2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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;
 }