[Scummvm-cvs-logs] scummvm master -> 16f7d5c6eccb8e1e96ef83c81b67f4f6e47ccece

sev- sev at scummvm.org
Sun Dec 29 08:43:46 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
16f7d5c6ec FULLPIPE: Plug scene13 in


Commit: 16f7d5c6eccb8e1e96ef83c81b67f4f6e47ccece
    https://github.com/scummvm/scummvm/commit/16f7d5c6eccb8e1e96ef83c81b67f4f6e47ccece
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T23:42:54-08:00

Commit Message:
FULLPIPE: Plug scene13 in

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/module.mk
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 6b4c3c5..dcd2ad0 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -530,6 +530,18 @@ namespace Fullpipe {
 #define ST_SWR_SITBALD 1153
 #define ST_SWR_STAND3 3014
 
+// Scene 13
+#define ANI_BRIDGE 1378
+#define ANI_HANDLE_L 1209
+#define ANI_HANDLE_R 1196
+#define ANI_STOROZH 1172
+#define ANI_WHIRLGIG_13 1383
+#define MV_WHR13_SPIN 1384
+#define SND_13_018 3763
+#define SND_13_037 5335
+#define ST_BDG_CLOSED 1380
+#define ST_BDG_OPEN2 1381
+
 // Scene 15
 #define ANI_BOOT_15 4779
 #define ANI_INV_BOOT 881
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 9720469..22b69ce 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -35,6 +35,7 @@ MODULE_OBJS = \
 	scenes/scene10.o \
 	scenes/scene11.o \
 	scenes/scene12.o \
+	scenes/scene13.o \
 	scenes/scene15.o \
 	scenes/scene24.o \
 	scenes/sceneDbg.o \
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index dca6e71..351aff4 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -190,6 +190,14 @@ Vars::Vars() {
 	scene12_fly = 0;
 	scene12_flyCountdown = 0;
 
+	scene13_whirlgig = 0;
+	scene13_guard = 0;
+	scene13_handleR = 0;
+	scene13_handleL = 0;
+	scene13_bridge = 0;
+	scene13_var01 = 0;
+	scene13_var02 = 0;
+
 	scene15_chantingCountdown = 0;
 	scene15_plusminus = 0;
 	scene15_ladder = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 88ad5e7..70d55dd 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -258,6 +258,14 @@ public:
 	int scene12_fly;
 	int scene12_flyCountdown;
 
+	StaticANIObject *scene13_whirlgig;
+	StaticANIObject *scene13_guard;
+	StaticANIObject *scene13_handleR;
+	StaticANIObject *scene13_handleL;
+	StaticANIObject *scene13_bridge;
+	int scene13_var01;
+	int scene13_var02;
+
 	int scene15_chantingCountdown;
 	StaticANIObject *scene15_plusminus;
 	PictureObject *scene15_ladder;






More information about the Scummvm-git-logs mailing list