FULLPIPE: Plug scene38 in

7 files changed, 60 insertions, 1 deletions

diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 29680486c3..ed070218e7 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1298,6 +1298,16 @@ namespace Fullpipe {
 #define ST_RNG_CLOSED2 4865
 #define ST_RNG_OPEN 2606
 
+// Scene 38
+#define ANI_BOTTLE38 2188
+#define ANI_DOMINO38 2200
+#define ANI_DOMINOS 3317
+#define ANI_DYLDA 2169
+#define ANI_GLAVAR 2154
+#define ANI_MALYSH 2165
+#define QU_SC38_ENTERLIFT 2836
+#define QU_SC38_EXITLIFT 2837
+
 // Debug scene
 #define MSG_RESTARTGAME 4767
 #define PIC_SCD_1 727
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index ecf3c12982..aa6e0dac3a 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -269,6 +269,7 @@ public:
 	int lift_getButtonIdP(int objid);
 	void lift_setButton(const char *name, int state);
 	void lift_sub5(Scene *sc, int qu1, int qu2);
+	void lift_sub7(Scene *sc, int buttonId);
 	void lift_exitSeq(ExCommand *ex);
 	void lift_closedoorSeq();
 	void lift_animation3();
diff --git a/engines/fullpipe/lift.cpp b/engines/fullpipe/lift.cpp
index cb811d610c..e5c566ebcf 100644
--- a/engines/fullpipe/lift.cpp
+++ b/engines/fullpipe/lift.cpp
@@ -111,4 +111,9 @@ bool FullpipeEngine::lift_checkButton(const char *varname) {
 	return false;
 }
 
+void FullpipeEngine::lift_sub7(Scene *sc, int buttonId) {
+	warning("STUB: lift_sub7()");
+}
+
+
 } // End of namespace Fullpipe
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index a6924911bc..d9cecf058a 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -58,6 +58,7 @@ MODULE_OBJS = \
 	scenes/scene35.o \
 	scenes/scene36.o \
 	scenes/scene37.o \
+	scenes/scene38.o \
 	scenes/sceneDbg.o
 
 # This module can be built as a plugin
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index c021a02d74..1e4a5633ea 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -365,6 +365,27 @@ Vars::Vars() {
 	scene37_soundFlipper = 0;
 	scene37_dudeX = 0;
 
+	scene38_var01 = 0;
+	scene38_var02 = 0;
+	scene38_var03 = 0;
+	scene38_var04 = 0;
+	scene38_boss = 0;
+	scene38_tally = 0;
+	scene38_shorty = 0;
+	scene38_domino0 = 0;
+	scene38_dominos = 0;
+	scene38_domino1 = 0;
+	scene38_bottle = 0;
+	scene38_var05 = 0;
+	scene38_var06 = 0;
+	scene38_var07 = 0;
+	scene38_var08 = 0;
+	scene38_var09 = 0;
+	scene38_var10 = 0;
+	scene38_var11 = 0;
+	scene38_var12 = 0;
+	scene38_var13 = 0;
+
 	selector = 0;
 }
 
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 61fb5b33ab..b35d0eb87f 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -516,6 +516,27 @@ public:
 	int scene37_soundFlipper;
 	int scene37_dudeX;
 
+	int scene38_var01;
+	int scene38_var02;
+	int scene38_var03;
+	int scene38_var04;
+	StaticANIObject *scene38_boss;
+	StaticANIObject *scene38_tally;
+	StaticANIObject *scene38_shorty;
+	StaticANIObject *scene38_domino0;
+	StaticANIObject *scene38_dominos;
+	StaticANIObject *scene38_domino1;
+	StaticANIObject *scene38_bottle;
+	int scene38_var05;
+	int scene38_var06;
+	int scene38_var07;
+	int scene38_var08;
+	int scene38_var09;
+	int scene38_var10;
+	int scene38_var11;
+	int scene38_var12;
+	int scene38_var13;
+
 	PictureObject *selector;
 };
 
diff --git a/engines/fullpipe/scenes/scene38.cpp b/engines/fullpipe/scenes/scene38.cpp
index 3fcbda1cb8..3a53c0f6f0 100644
--- a/engines/fullpipe/scenes/scene38.cpp
+++ b/engines/fullpipe/scenes/scene38.cpp
@@ -65,7 +65,7 @@ void scene38_initScene(Scene *sc) {
 	scene38_setBottleState(sc);
 
 	if (g_fp->getObjectState(sO_Boss) == g_fp->getObjectEnumState(sO_Boss, sO_IsSleeping)) {
-		g_vars->scene38_shorty->flags &= 0xFFFB;
+		g_vars->scene38_shorty->_flags &= 0xFFFB;
 
 		g_vars->scene38_tally->stopAnim_maybe();
 		g_vars->scene38_tally->_flags &= 0xFFFB;