[Scummvm-cvs-logs] scummvm master -> 0176d343bcc11cd1993587697edd065b03302c24

sev- sev at scummvm.org
Mon Jan 6 09:04:18 CET 2014


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

Summary:
7f85a36703 FULLPIPE: Initial code for scene28
0176d343bc FULLPIPE: Plug scene28 in


Commit: 7f85a36703dd9f1379961c8764235eccca15e43f
    https://github.com/scummvm/scummvm/commit/7f85a36703dd9f1379961c8764235eccca15e43f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T00:00:39-08:00

Commit Message:
FULLPIPE: Initial code for scene28

Changed paths:
  A engines/fullpipe/scenes/scene28.cpp



diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
new file mode 100644
index 0000000..c904c69
--- /dev/null
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -0,0 +1,57 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "fullpipe/fullpipe.h"
+
+#include "fullpipe/objectnames.h"
+#include "fullpipe/constants.h"
+
+#include "fullpipe/gameloader.h"
+#include "fullpipe/motion.h"
+#include "fullpipe/scenes.h"
+#include "fullpipe/statics.h"
+
+#include "fullpipe/interaction.h"
+#include "fullpipe/behavior.h"
+
+
+namespace Fullpipe {
+
+void scene28_initScene() {
+	g_vars->scene28_var01 = 200;
+	g_vars->scene28_var02 = 200;
+	g_vars->scene28_var03 = 300;
+	g_vars->scene28_var04 = 300;
+	g_vars->scene28_var05 = 1;
+	g_vars->scene28_var06 = 1;
+	g_vars->scene28_var07 = 0;
+	g_vars->scene28_var08 = 0;
+	g_vars->scene28_var09 = 0;
+	g_vars->scene28_var10 = 0;
+	g_vars->scene28_var11 = 0;
+
+	g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_28"));
+	
+	g_fp->initArcadeKeys("SC_28");
+}
+
+} // End of namespace Fullpipe


Commit: 0176d343bcc11cd1993587697edd065b03302c24
    https://github.com/scummvm/scummvm/commit/0176d343bcc11cd1993587697edd065b03302c24
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T00:03:24-08:00

Commit Message:
FULLPIPE: Plug scene28 in

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



diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 8a4350e..a2d4961 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -47,6 +47,7 @@ MODULE_OBJS = \
 	scenes/scene24.o \
 	scenes/scene25.o \
 	scenes/scene26.o \
+	scenes/scene28.o \
 	scenes/scene30.o \
 	scenes/scene31.o \
 	scenes/scene36.o \
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 50335a4..04e2714 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -298,6 +298,18 @@ Vars::Vars() {
 	scene26_sock = 0;
 	scene26_activeVent = 0;
 
+	scene28_var01 = 0;
+	scene28_var02 = 0;
+	scene28_var03 = 0;
+	scene28_var04 = 0;
+	scene28_var05 = 1;
+	scene28_var06 = 1;
+	scene28_var07 = 0;
+	scene28_var08 = 0;
+	scene28_var09 = 0;
+	scene28_var10 = 0;
+	scene28_var11 = 0;
+
 	scene30_leg = 0;
 	scene30_liftFlag = 1;
 
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 169ee8b..7d7bb6e 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -422,6 +422,18 @@ public:
 	StaticANIObject *scene26_sock;
 	StaticANIObject *scene26_activeVent;
 
+	int scene28_var01;
+	int scene28_var02;
+	int scene28_var03;
+	int scene28_var04;
+	int scene28_var05;
+	int scene28_var06;
+	int scene28_var07;
+	int scene28_var08;
+	int scene28_var09;
+	int scene28_var10;
+	int scene28_var11;
+
 	StaticANIObject *scene30_leg;
 	int scene30_liftFlag;
 
diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
index c904c69..bdb1699 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -32,7 +32,7 @@
 
 #include "fullpipe/interaction.h"
 #include "fullpipe/behavior.h"
-
+#include "fullpipe/floaters.h"
 
 namespace Fullpipe {
 
@@ -49,7 +49,7 @@ void scene28_initScene() {
 	g_vars->scene28_var10 = 0;
 	g_vars->scene28_var11 = 0;
 
-	g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_28"));
+	g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_28"));
 	
 	g_fp->initArcadeKeys("SC_28");
 }






More information about the Scummvm-git-logs mailing list