[Scummvm-cvs-logs] scummvm master -> 8600bdecd379f26b65e9aaabda3a19f8e81cbde6
sev-
sev at scummvm.org
Wed Dec 25 08:15:25 CET 2013
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2ad2eb12ee FULLPIPE: Implement scene12_init()
ee8d6c4723 FULLPIPE: Implement sceneHandler12()
d509744df5 FULLPIPE: Plug scene12 in
8600bdecd3 FULLPIPE: Catch unplugged scenes
Commit: 2ad2eb12eea831ef0a781d837b772f8ac196ee76
https://github.com/scummvm/scummvm/commit/2ad2eb12eea831ef0a781d837b772f8ac196ee76
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T23:13:52-08:00
Commit Message:
FULLPIPE: Implement scene12_init()
Changed paths:
A engines/fullpipe/scenes/scene12.cpp
engines/fullpipe/module.mk
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 15bf9c9..6f8fbe2 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -34,6 +34,7 @@ MODULE_OBJS = \
scenes/scene08.o \
scenes/scene10.o \
scenes/scene11.o \
+ scenes/scene12.o \
scenes/scene15.o \
scenes/sceneDbg.o \
scenes/sceneIntro.o
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index fdfee97..ebdcf39 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -186,6 +186,9 @@ Vars::Vars() {
scene11_var19 = 0;
scene11_var20 = 0;
+ scene12_fly = 0;
+ scene12_flyCountdown = 0;
+
scene15_chantingCountdown = 0;
scene15_plusminus = 0;
scene15_ladder = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 8c4257f..53cabed 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -242,6 +242,9 @@ public:
int scene11_var19;
int scene11_var20;
+ int scene12_fly;
+ int scene12_flyCountdown;
+
int scene15_chantingCountdown;
StaticANIObject *scene15_plusminus;
PictureObject *scene15_ladder;
diff --git a/engines/fullpipe/scenes/scene12.cpp b/engines/fullpipe/scenes/scene12.cpp
new file mode 100644
index 0000000..6005951
--- /dev/null
+++ b/engines/fullpipe/scenes/scene12.cpp
@@ -0,0 +1,47 @@
+/* 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/objects.h"
+#include "fullpipe/objectnames.h"
+#include "fullpipe/constants.h"
+#include "fullpipe/motion.h"
+#include "fullpipe/scenes.h"
+#include "fullpipe/scene.h"
+#include "fullpipe/floaters.h"
+
+namespace Fullpipe {
+
+void scene12_initScene() {
+ GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("SC_12");
+ g_fp->_floaters->init(var);
+
+ g_vars->scene12_fly = g_fp->getObjectState("Муха_12");
+
+ if (g_vars->scene12_fly)
+ g_vars->scene12_flyCountdown = 600 * g_fp->_rnd->getRandomNumber(32767) / 0x7fff + 600;
+
+ g_fp->setObjectState("Муха_12", g_fp->_rnd->getRandomNumber(1));
+}
+
+} // End of namespace Fullpipe
Commit: ee8d6c47237a1c297cc84496e21f7e2cee52b915
https://github.com/scummvm/scummvm/commit/ee8d6c47237a1c297cc84496e21f7e2cee52b915
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T23:13:52-08:00
Commit Message:
FULLPIPE: Implement sceneHandler12()
Changed paths:
engines/fullpipe/scenes/scene12.cpp
diff --git a/engines/fullpipe/scenes/scene12.cpp b/engines/fullpipe/scenes/scene12.cpp
index 6005951..c5e0391 100644
--- a/engines/fullpipe/scenes/scene12.cpp
+++ b/engines/fullpipe/scenes/scene12.cpp
@@ -29,6 +29,9 @@
#include "fullpipe/scenes.h"
#include "fullpipe/scene.h"
#include "fullpipe/floaters.h"
+#include "fullpipe/messages.h"
+#include "fullpipe/statics.h"
+#include "fullpipe/behavior.h"
namespace Fullpipe {
@@ -44,4 +47,35 @@ void scene12_initScene() {
g_fp->setObjectState("Муха_12", g_fp->_rnd->getRandomNumber(1));
}
+void sceneHandler12_updateFloaters() {
+ warning("STUB: sceneHandler12_updateFloaters()");
+}
+
+int sceneHandler12(ExCommand *cmd) {
+ int res = 0;
+
+ if (cmd->_messageKind == 17 && cmd->_messageNum == 33) {
+ if (g_fp->_aniMan2) {
+ if (g_fp->_aniMan2->_ox < g_fp->_sceneRect.left + 200)
+ g_fp->_currentScene->_x = g_fp->_aniMan2->_ox - g_fp->_sceneRect.left - 300;
+
+ if (g_fp->_aniMan2->_ox > g_fp->_sceneRect.right - 200)
+ g_fp->_currentScene->_x = g_fp->_aniMan2->_ox - g_fp->_sceneRect.right + 300;
+
+ res = 1;
+ }
+
+ g_vars->scene12_flyCountdown--;
+
+ if (!g_vars->scene12_flyCountdown)
+ sceneHandler12_updateFloaters();
+
+ g_fp->_floaters->update();
+
+ g_fp->_behaviorManager->updateBehaviors();
+ }
+
+ return res;
+}
+
} // End of namespace Fullpipe
Commit: d509744df58a0c6941677279f1525015caf88392
https://github.com/scummvm/scummvm/commit/d509744df58a0c6941677279f1525015caf88392
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T23:14:42-08:00
Commit Message:
FULLPIPE: Plug scene12 in
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene12.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index ebdcf39..89b0b2d 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -438,6 +438,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene11_setupMusic();
_updateCursorCallback = scene11_updateCursor;
break;
+#endif
case SC_12:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_12");
@@ -450,6 +451,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
_updateCursorCallback = defaultUpdateCursor;
break;
+#if 0
case SC_13:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_13");
scene->preloadMovements(sceneVar);
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 53cabed..270c203 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -72,6 +72,9 @@ void scene10_initScene(Scene *sc);
int sceneHandler10(ExCommand *cmd);
int scene10_updateCursor();
+void scene12_initScene(Scene *sc);
+int sceneHandler12(ExCommand *ex);
+
int scene15_updateCursor();
void scene15_initScene(Scene *sc);
int sceneHandler15(ExCommand *cmd);
diff --git a/engines/fullpipe/scenes/scene12.cpp b/engines/fullpipe/scenes/scene12.cpp
index c5e0391..da685a1 100644
--- a/engines/fullpipe/scenes/scene12.cpp
+++ b/engines/fullpipe/scenes/scene12.cpp
@@ -35,16 +35,16 @@
namespace Fullpipe {
-void scene12_initScene() {
+void scene12_initScene(Scene *sc) {
GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("SC_12");
g_fp->_floaters->init(var);
- g_vars->scene12_fly = g_fp->getObjectState("Муха_12");
+ g_vars->scene12_fly = g_fp->getObjectState(sO_Fly_12);
if (g_vars->scene12_fly)
g_vars->scene12_flyCountdown = 600 * g_fp->_rnd->getRandomNumber(32767) / 0x7fff + 600;
- g_fp->setObjectState("Муха_12", g_fp->_rnd->getRandomNumber(1));
+ g_fp->setObjectState(sO_Fly_12, g_fp->_rnd->getRandomNumber(1));
}
void sceneHandler12_updateFloaters() {
Commit: 8600bdecd379f26b65e9aaabda3a19f8e81cbde6
https://github.com/scummvm/scummvm/commit/8600bdecd379f26b65e9aaabda3a19f8e81cbde6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-24T23:14:42-08:00
Commit Message:
FULLPIPE: Catch unplugged scenes
Changed paths:
engines/fullpipe/scenes.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 89b0b2d..b4f95d3 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -792,6 +792,8 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
default:
_behaviorManager->initBehavior(0, 0);
+
+ error("Unknown scene %d", entrance->_sceneId);
break;
}
More information about the Scummvm-git-logs
mailing list