[Scummvm-cvs-logs] scummvm master -> 420f3da3e0110738f1d55504d93f08264957efaa
sev-
sev at scummvm.org
Sun Jan 12 11:15:38 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:
19c8acb992 FULLPIPE: Initial code for scene34
420f3da3e0 FULLPIPE: Plug scene34 in
Commit: 19c8acb992a176d1b32937f7bb786a89cc828060
https://github.com/scummvm/scummvm/commit/19c8acb992a176d1b32937f7bb786a89cc828060
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-12T02:07:34-08:00
Commit Message:
FULLPIPE: Initial code for scene34
Changed paths:
A engines/fullpipe/scenes/scene34.cpp
diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp
new file mode 100644
index 0000000..e2e2408
--- /dev/null
+++ b/engines/fullpipe/scenes/scene34.cpp
@@ -0,0 +1,82 @@
+/* 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 scene34_initScene(Scene *sc) {
+ g_vars->scene34_var01 = 200;
+ g_vars->scene34_var02 = 200;
+ g_vars->scene34_var03 = 300;
+ g_vars->scene34_var04 = 300;
+ g_vars->scene34_cactus = sc->getStaticANIObject1ById(ANI_CACTUS_34, -1);
+ g_vars->scene34_vent = sc->getStaticANIObject1ById(ANI_VENT_34, -1);
+ g_vars->scene34_hatch = sc->getStaticANIObject1ById(ANI_LUK_34, -1);
+ g_vars->scene34_boot = sc->getStaticANIObject1ById(ANI_BOOT_34, -1);
+
+ if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown)) {
+ Scene *oldsc = g_fp->_currentScene;
+
+ g_fp->_currentScene = sc;
+
+ g_vars->scene34_cactus->changeStatics2(ST_CTS34_EMPTY);
+ g_vars->scene34_cactus->setOXY(506, 674);
+ g_vars->scene34_cactus->_priority = 30;
+
+ g_vars->scene34_cactus->changeStatics2(ST_CTS34_GROWNEMPTY2);
+ g_vars->scene34_cactus->_flags |= 4;
+
+ g_fp->_currentScene = oldsc;
+ }
+
+ if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_Strolling))
+ g_fp->setObjectState(sO_Grandma, g_fp->getObjectEnumState(sO_Grandma, sO_OnStool));
+
+ sceneHandler34_setExits();
+
+ g_vars->scene34_var05 = 0;
+ g_vars->scene34_var06 = 0;
+ g_vars->scene34_var07 = 0;
+ g_vars->scene34_var08 = g_fp->_rnd->getRandomNumber(500) + 500;
+
+ g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_34"));
+
+ g_fp->lift_setButton("Этаж 7", ST_LBN_7N);
+ g_fp->lift_sub5(sc, QU_SC34_ENTERLIFT, QU_SC34_EXITLIFT);
+
+ initArcadeKeys("SC_34");
+}
+
+} // End of namespace Fullpipe
Commit: 420f3da3e0110738f1d55504d93f08264957efaa
https://github.com/scummvm/scummvm/commit/420f3da3e0110738f1d55504d93f08264957efaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-12T02:14:59-08:00
Commit Message:
FULLPIPE: Plug scene34 in
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/module.mk
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene34.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 4f8e33c..f10b3a8 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1135,6 +1135,16 @@ namespace Fullpipe {
#define ST_VNT33_DOWN 2640
#define ST_VNT33_RIGHT 2639
+// Scene 34
+#define ANI_BOOT_34 4560
+#define ANI_CACTUS_34 2381
+#define ANI_LUK_34 2541
+#define ANI_VENT_34 2473
+#define QU_SC34_ENTERLIFT 2819
+#define QU_SC34_EXITLIFT 2820
+#define ST_CTS34_EMPTY 2383
+#define ST_CTS34_GROWNEMPTY2 2475
+
// Scene 36
#define ANI_SCISSORS_36 2647
#define ANI_ROTOHRUST 2360
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index af4e614..ae259d9 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -54,6 +54,7 @@ MODULE_OBJS = \
scenes/scene31.o \
scenes/scene32.o \
scenes/scene33.o \
+ scenes/scene34.o \
scenes/scene36.o \
scenes/sceneDbg.o
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 4b0a3a1..11f8e19 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -339,6 +339,19 @@ Vars::Vars() {
scene33_ventsState[i] = 0;
}
+ scene34_var01 = 0;
+ scene34_var02 = 0;
+ scene34_var03 = 0;
+ scene34_var04 = 0;
+ scene34_cactus = 0;
+ scene34_vent = 0;
+ scene34_hatch = 0;
+ scene34_boot = 0;
+ scene34_var05 = 0;
+ scene34_var06 = 0;
+ scene34_var07 = 0;
+ scene34_var08 = 0;
+
scene36_rotohrust = 0;
scene36_scissors = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index cd614ed..1348740 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -477,6 +477,19 @@ public:
int scene33_ventsX[9];
int scene33_ventsState[9];
+ int scene34_var01;
+ int scene34_var02;
+ int scene34_var03;
+ int scene34_var04;
+ StaticANIObject *scene34_cactus;
+ StaticANIObject *scene34_vent;
+ StaticANIObject *scene34_hatch;
+ StaticANIObject *scene34_boot;
+ int scene34_var05;
+ int scene34_var06;
+ int scene34_var07;
+ int scene34_var08;
+
StaticANIObject *scene36_rotohrust;
StaticANIObject *scene36_scissors;
diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp
index e2e2408..2361e7c 100644
--- a/engines/fullpipe/scenes/scene34.cpp
+++ b/engines/fullpipe/scenes/scene34.cpp
@@ -32,10 +32,15 @@
#include "fullpipe/interaction.h"
#include "fullpipe/behavior.h"
+#include "fullpipe/floaters.h"
namespace Fullpipe {
+void sceneHandler34_setExits() {
+ warning("STUB: sceneHandler34_setExits()");
+}
+
void scene34_initScene(Scene *sc) {
g_vars->scene34_var01 = 200;
g_vars->scene34_var02 = 200;
@@ -46,7 +51,7 @@ void scene34_initScene(Scene *sc) {
g_vars->scene34_hatch = sc->getStaticANIObject1ById(ANI_LUK_34, -1);
g_vars->scene34_boot = sc->getStaticANIObject1ById(ANI_BOOT_34, -1);
- if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown)) {
+ if (g_fp->getObjectState(sO_Cactus) == g_fp->getObjectEnumState(sO_Cactus, sO_HasGrown)) {
Scene *oldsc = g_fp->_currentScene;
g_fp->_currentScene = sc;
@@ -73,10 +78,10 @@ void scene34_initScene(Scene *sc) {
g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_34"));
- g_fp->lift_setButton("Этаж 7", ST_LBN_7N);
+ g_fp->lift_setButton(sO_Level7, ST_LBN_7N);
g_fp->lift_sub5(sc, QU_SC34_ENTERLIFT, QU_SC34_EXITLIFT);
- initArcadeKeys("SC_34");
+ g_fp->initArcadeKeys("SC_34");
}
} // End of namespace Fullpipe
More information about the Scummvm-git-logs
mailing list