[Scummvm-cvs-logs] scummvm master -> f60b6cb17d138eadbefad42e20bc8554fc2fd633
sev-
sev at scummvm.org
Thu Jan 16 17:28:37 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:
f79390fea2 FULLPIPE: Initial code for scene35
f60b6cb17d FULLPIPE: Plug scene35 in
Commit: f79390fea2a8638cddb512a91ed067d988946a8b
https://github.com/scummvm/scummvm/commit/f79390fea2a8638cddb512a91ed067d988946a8b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-16T08:27:49-08:00
Commit Message:
FULLPIPE: Initial code for scene35
Changed paths:
A engines/fullpipe/scenes/scene35.cpp
diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp
new file mode 100644
index 0000000..25f926d
--- /dev/null
+++ b/engines/fullpipe/scenes/scene35.cpp
@@ -0,0 +1,77 @@
+/* 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 scene35_initScene(Scene *sc) {
+ g_vars->scene35_var01 = 200;
+ g_vars->scene35_var02 = 200;
+ g_vars->scene35_var03 = 300;
+ g_vars->scene35_var04 = 300;
+ g_vars->scene35_hose = Scene_getStaticANIObject1ById(sc, ANI_HOSE, -1);
+ g_vars->scene35_bellyInflater = Scene_getStaticANIObject1ById(sc, ANI_PUZODUV, -1);
+ g_vars->scene35_var05 = 0;
+ g_vars->scene35_var06 = 0;
+
+ MovGraphLink *lnk = getSc2MctlCompoundBySceneId(sc->_sceneId)->getLinkByName(sO_CloseThing);
+
+ if (g_vars->scene35_bellyInflater->_statics->_staticsId == ST_PDV_LARGE)
+ lnk->_flags |= 0x20000000;
+ else
+ lnk->_flags &= 0xDFFFFFFF;
+
+ int sndId = 0;
+
+ if (getObjectState(sO_Valve_35) == getObjectEnumState(sO_Valve_35, sO_TurnedOn)) {
+ if ((g_vars->scene35_hose->_flags & 4) && g_vars->scene35_hose->_statics->_staticsId == ST_HZE_NORM) {
+ sndId = SND_35_012;
+ } else if (g_vars->scene35_bellyInflater->_statics->_staticsId == ST_PDV_SMALL) {
+ sndId = SND_35_011;
+ }
+ }
+
+ if (sndId)
+ g_fp->playSound(sndId, 1);
+
+ g_fp->lift_setButton(sO_Level6, ST_LBN_6N);
+ g_fp->lift_sub5(sc, QU_SC35_ENTERLIFT, QU_SC35_EXITLIFT);
+
+ g_fp->initArcadeKeys("SC_35");
+
+ g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_35"));
+}
+
+} // End of namespace Fullpipe
Commit: f60b6cb17d138eadbefad42e20bc8554fc2fd633
https://github.com/scummvm/scummvm/commit/f60b6cb17d138eadbefad42e20bc8554fc2fd633
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-16T08:27:49-08:00
Commit Message:
FULLPIPE: Plug scene35 in
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/module.mk
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene35.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 1a6ecbb..af7dc45 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1257,6 +1257,17 @@ namespace Fullpipe {
#define ST_VNT34_RIGHT3 4318
#define ST_VNT34_UP2 4310
+// Scene 35
+#define ANI_HOSE 2424
+#define ANI_PUZODUV 2418
+#define QU_SC35_ENTERLIFT 2815
+#define QU_SC35_EXITLIFT 2816
+#define SND_35_011 4509
+#define SND_35_012 4510
+#define ST_HZE_NORM 2426
+#define ST_PDV_LARGE 2421
+#define ST_PDV_SMALL 2420
+
// Scene 36
#define ANI_SCISSORS_36 2647
#define ANI_ROTOHRUST 2360
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index ae259d9..5f7d8a4 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -55,6 +55,7 @@ MODULE_OBJS = \
scenes/scene32.o \
scenes/scene33.o \
scenes/scene34.o \
+ scenes/scene35.o \
scenes/scene36.o \
scenes/sceneDbg.o
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 02fb33b..a4bf2dc 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -348,6 +348,15 @@ Vars::Vars() {
scene34_dudeOnCactus = false;
scene34_fliesCountdown = 0;
+ scene35_var01 = 0;
+ scene35_var02 = 0;
+ scene35_var03 = 0;
+ scene35_var04 = 0;
+ scene35_hose = 0;
+ scene35_bellyInflater = 0;
+ scene35_var05 = 0;
+ scene35_var06 = 0;
+
scene36_rotohrust = 0;
scene36_scissors = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index d4757ba..42a56be 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -491,6 +491,15 @@ public:
bool scene34_dudeOnCactus;
int scene34_fliesCountdown;
+ int scene35_var01;
+ int scene35_var02;
+ int scene35_var03;
+ int scene35_var04;
+ StaticANIObject *scene35_hose;
+ StaticANIObject *scene35_bellyInflater;
+ int scene35_var05;
+ int scene35_var06;
+
StaticANIObject *scene36_rotohrust;
StaticANIObject *scene36_scissors;
diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp
index 25f926d..5698cbc 100644
--- a/engines/fullpipe/scenes/scene35.cpp
+++ b/engines/fullpipe/scenes/scene35.cpp
@@ -33,6 +33,7 @@
#include "fullpipe/interaction.h"
#include "fullpipe/behavior.h"
+#include "fullpipe/floaters.h"
namespace Fullpipe {
@@ -41,8 +42,8 @@ void scene35_initScene(Scene *sc) {
g_vars->scene35_var02 = 200;
g_vars->scene35_var03 = 300;
g_vars->scene35_var04 = 300;
- g_vars->scene35_hose = Scene_getStaticANIObject1ById(sc, ANI_HOSE, -1);
- g_vars->scene35_bellyInflater = Scene_getStaticANIObject1ById(sc, ANI_PUZODUV, -1);
+ g_vars->scene35_hose = sc->getStaticANIObject1ById(ANI_HOSE, -1);
+ g_vars->scene35_bellyInflater = sc->getStaticANIObject1ById(ANI_PUZODUV, -1);
g_vars->scene35_var05 = 0;
g_vars->scene35_var06 = 0;
@@ -55,7 +56,7 @@ void scene35_initScene(Scene *sc) {
int sndId = 0;
- if (getObjectState(sO_Valve_35) == getObjectEnumState(sO_Valve_35, sO_TurnedOn)) {
+ if (g_fp->getObjectState(sO_Valve_35) == g_fp->getObjectEnumState(sO_Valve_35, sO_TurnedOn)) {
if ((g_vars->scene35_hose->_flags & 4) && g_vars->scene35_hose->_statics->_staticsId == ST_HZE_NORM) {
sndId = SND_35_012;
} else if (g_vars->scene35_bellyInflater->_statics->_staticsId == ST_PDV_SMALL) {
@@ -71,7 +72,7 @@ void scene35_initScene(Scene *sc) {
g_fp->initArcadeKeys("SC_35");
- g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_35"));
+ g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_35"));
}
} // End of namespace Fullpipe
More information about the Scummvm-git-logs
mailing list