FULLPIPE: Plug scene14 in

scummvm · Dec 30, 2013 · bcb48c9 · bcb48c9
1 parent c4c21c6
commit bcb48c9
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1 deletion.
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
@@ -578,6 +578,12 @@ namespace Fullpipe {
 #define ST_STR_LEFT 1175
 #define ST_STR_RIGHT 1174
 
+// Scene 14
+#define ANI_BALL14 1246
+#define ANI_GRANDMA 1227
+#define QU_SC14_ENTERLIFT 1225
+#define QU_SC14_EXITLIFT 1226
+
 // Scene 15
 #define ANI_BOOT_15 4779
 #define ANI_INV_BOOT 881

diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
@@ -36,6 +36,7 @@ MODULE_OBJS = \
 	scenes/scene11.o \
 	scenes/scene12.o \
 	scenes/scene13.o \
+	scenes/scene14.o \
 	scenes/scene15.o \
 	scenes/scene24.o \
 	scenes/sceneDbg.o \

diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
@@ -198,6 +198,21 @@ Vars::Vars() {
 	scene13_guardDirection = false;
 	scene13_dudeX = 0;
 
+	scene14_grandma = 0;
+	scene14_var01 = 0;
+	scene14_var02 = 0;
+	scene14_var03 = 0;
+	scene14_var04 = 0;
+	scene14_var05 = 0;
+	scene14_var06 = 0;
+	scene14_var07 = 0;
+	scene14_var08 = 0;
+	scene14_pink = 0;
+	scene14_var10 = 0;
+	scene14_var11.clear();
+	scene14_var12.clear();
+	scene14_var13 = 0;
+
 	scene15_chantingCountdown = 0;
 	scene15_plusminus = 0;
 	scene15_ladder = 0;

diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
@@ -269,6 +269,21 @@ class Vars {
 	bool scene13_guardDirection;
 	int scene13_dudeX;
 
+	StaticANIObject *scene14_grandma;
+	int scene14_var01;
+	int scene14_var02;
+	int scene14_var03;
+	int scene14_var04;
+	int scene14_var05;
+	int scene14_var06;
+	int scene14_var07;
+	int scene14_var08;
+	StaticANIObject *scene14_pink;
+	int scene14_var10;
+	Common::List<StaticANIObject *> scene14_var11;
+	Common::List<StaticANIObject *> scene14_var12;
+	int scene14_var13;
+
 	int scene15_chantingCountdown;
 	StaticANIObject *scene15_plusminus;
 	PictureObject *scene15_ladder;

diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
@@ -37,7 +37,7 @@
 namespace Fullpipe {
 
 void scene14_initScene(Scene *sc) {
-	g_vars->scene14_grandma = Scene_getStaticANIObject1ById(sc, ANI_GRANDMA, -1);
+	g_vars->scene14_grandma = sc->getStaticANIObject1ById(ANI_GRANDMA, -1);
 	g_vars->scene14_var01 = 200;
 	g_vars->scene14_var02 = 200;
 	g_vars->scene14_var03 = 0;