[Scummvm-cvs-logs] scummvm master -> c91f21ff7f2a0010bac1592ab08090fc064f8a80
sev-
sev at scummvm.org
Thu Jan 2 15:42:26 CET 2014
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
341a134713 FULLPIPE: Confirmed constants
e1b1937570 FULLPIPE: Initial code for scene20
c42648fd00 FULLPIPE: Plug scene20 in
7331a7cbef FULLPIPE: Implement scene20_setExits()
a48ce090c2 FULLPIPE: Implement sceneHandler20()
dcfca53ace FULLPIPE: Implement sceneHandler20_updateFlies()
2636b92af1 FULLPIPE: Renames in scene20
c91f21ff7f FULLPIPE: Enable scene20. This completes the scene
Commit: 341a134713eb3ecf445bea81e41574ccbc14edaa
https://github.com/scummvm/scummvm/commit/341a134713eb3ecf445bea81e41574ccbc14edaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T05:31:19-08:00
Commit Message:
FULLPIPE: Confirmed constants
Changed paths:
engines/fullpipe/scenes/scene17.cpp
diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/fullpipe/scenes/scene17.cpp
index 231934d..73bf7ab 100644
--- a/engines/fullpipe/scenes/scene17.cpp
+++ b/engines/fullpipe/scenes/scene17.cpp
@@ -62,9 +62,9 @@ void scene17_restoreState() {
g_vars->scene17_flyState = g_fp->getObjectState(sO_Fly_17);
if (g_vars->scene17_flyState <= 0 ) {
- g_vars->scene17_flyCountdown = g_fp->_rnd->getRandomNumber(600) + 600; // FIXME. Check
+ g_vars->scene17_flyCountdown = g_fp->_rnd->getRandomNumber(600) + 600;
- g_vars->scene17_flyState = g_fp->_rnd->getRandomNumber(4) + 1; // FIXME. Check
+ g_vars->scene17_flyState = g_fp->_rnd->getRandomNumber(4) + 1;
}
g_fp->setObjectState(sO_Fly_17, g_vars->scene17_flyState - 1);
@@ -157,7 +157,7 @@ void sceneHandler17_moonshineFill() {
void sceneHandler17_updateFlies() {
g_fp->_floaters->genFlies(g_fp->_currentScene, 239, -50, 20, 4);
- g_fp->_floaters->_array2[0]->countdown = g_fp->_rnd->getRandomNumber(5) + 6; // FIXME. Check
+ g_fp->_floaters->_array2[0]->countdown = g_fp->_rnd->getRandomNumber(5) + 6;
g_fp->_floaters->_array2[0]->val6 = 239;
g_fp->_floaters->_array2[0]->val7 = -50;
}
Commit: e1b19375708a1af89ec621bb91228cdff4964fdd
https://github.com/scummvm/scummvm/commit/e1b19375708a1af89ec621bb91228cdff4964fdd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T05:57:09-08:00
Commit Message:
FULLPIPE: Initial code for scene20
Changed paths:
A engines/fullpipe/scenes/scene20.cpp
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp
new file mode 100644
index 0000000..0dc24df
--- /dev/null
+++ b/engines/fullpipe/scenes/scene20.cpp
@@ -0,0 +1,83 @@
+/* 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 scene20_setExits(Scene *sc) {
+ warning("STUB: scene20_setExits()");
+}
+
+void scene20_initScene(Scene *sc) {
+ g_vars->scene20_var01 = 200;
+ g_vars->scene20_var02 = 200;
+ g_vars->scene20_var03 = 300;
+ g_vars->scene20_var04 = 300;
+
+ Scene *oldsc = g_fp->_currentScene;
+
+ g_vars->scene20_grandma = sc->getStaticANIObject1ById(ANI_GRANDMA_20, -1);
+
+ g_fp->_currentScene = sc;
+
+ if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnTheFloor))
+ g_fp->setObjectState(sO_Grandma, g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe));
+
+ if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnStool)) {
+ StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_STOOL);
+ } else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnTheFloor)) {
+ StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_FLOOR);
+ } else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe)
+ || g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) {
+ StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_STAND);
+ } else {
+ StaticANIObject_hide(g_vars->scene20_grandma);
+ }
+
+ scene20_setExits(sc);
+
+ g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_20"));
+
+ for (int i = 0; i < 3; i++) {
+ g_fp->_floaters->genFlies(sc, g_fp->_rnd->getRandomNumber(101) + 70, g_fp->_rnd->getRandomNumber(51) + 175, 100, 0);
+ g_fp->_floaters->_array2[g_fp->_floaters->_array2.size() - 1]->val13 = g_fp->_rnd->getRandomNumber(9);
+ }
+
+ g_fp->_currentScene = oldsc;
+
+ g_vars->scene20_var05 = g_fp->_rnd->getRandomNumber(200) + 400;
+}
+
+} // End of namespace Fullpipe
Commit: c42648fd00265aadf2708558b8b7d9ef75e613fe
https://github.com/scummvm/scummvm/commit/c42648fd00265aadf2708558b8b7d9ef75e613fe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T06:03:39-08:00
Commit Message:
FULLPIPE: Plug scene20 in
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/module.mk
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene20.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 16dac18..e99f883 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -723,6 +723,12 @@ namespace Fullpipe {
#define ST_MUG17_EMPTY 2739
#define ST_SMG_SIT 1399
+// Scene 20
+#define ANI_GRANDMA_20 2427
+#define ST_GMA20_FLOOR 2429
+#define ST_GMA20_STAND 2436
+#define ST_GMA20_STOOL 2432
+
// Scene 21
#define ANI_GIRAFFE_BOTTOM 1633
#define MSG_SC21_UPDATEASS 4211
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 3a0ccc9..245cbae 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -40,6 +40,7 @@ MODULE_OBJS = \
scenes/scene15.o \
scenes/scene16.o \
scenes/scene17.o \
+ scenes/scene20.o \
scenes/scene21.o \
scenes/scene24.o \
scenes/scene30.o \
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 16fa78c..2c67a47 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -247,6 +247,13 @@ Vars::Vars() {
scene17_handPhase = false;
scene17_sceneEdgeX = 0;
+ scene20_var01 = 0;
+ scene20_var02 = 0;
+ scene20_var03 = 0;
+ scene20_var04 = 0;
+ scene20_var05 = 0;
+ scene20_grandma = 0;
+
scene21_giraffeBottom = 0;
scene21_giraffeBottomX = 0;
scene21_giraffeBottomY = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 4ff23d2..7e30c86 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -348,6 +348,13 @@ public:
bool scene17_handPhase;
int scene17_sceneEdgeX;
+ int scene20_var01;
+ int scene20_var02;
+ int scene20_var03;
+ int scene20_var04;
+ int scene20_var05;
+ StaticANIObject *scene20_grandma;
+
StaticANIObject *scene21_giraffeBottom;
int scene21_giraffeBottomX;
int scene21_giraffeBottomY;
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp
index 0dc24df..c10ff2e 100644
--- a/engines/fullpipe/scenes/scene20.cpp
+++ b/engines/fullpipe/scenes/scene20.cpp
@@ -32,7 +32,7 @@
#include "fullpipe/interaction.h"
#include "fullpipe/behavior.h"
-
+#include "fullpipe/floaters.h"
namespace Fullpipe {
@@ -56,19 +56,19 @@ void scene20_initScene(Scene *sc) {
g_fp->setObjectState(sO_Grandma, g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe));
if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnStool)) {
- StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_STOOL);
+ g_vars->scene20_grandma->changeStatics2(ST_GMA20_STOOL);
} else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnTheFloor)) {
- StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_FLOOR);
+ g_vars->scene20_grandma->changeStatics2(ST_GMA20_FLOOR);
} else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe)
|| g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) {
- StaticANIObject_changeStatics2(g_vars->scene20_grandma, ST_GMA20_STAND);
+ g_vars->scene20_grandma->changeStatics2(ST_GMA20_STAND);
} else {
- StaticANIObject_hide(g_vars->scene20_grandma);
+ g_vars->scene20_grandma->hide();
}
scene20_setExits(sc);
- g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_20"));
+ g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_20"));
for (int i = 0; i < 3; i++) {
g_fp->_floaters->genFlies(sc, g_fp->_rnd->getRandomNumber(101) + 70, g_fp->_rnd->getRandomNumber(51) + 175, 100, 0);
Commit: 7331a7cbefed7be415da170a32a2549b1c18fd12
https://github.com/scummvm/scummvm/commit/7331a7cbefed7be415da170a32a2549b1c18fd12
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T06:14:54-08:00
Commit Message:
FULLPIPE: Implement scene20_setExits()
Changed paths:
engines/fullpipe/scenes/scene20.cpp
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp
index c10ff2e..45d5971 100644
--- a/engines/fullpipe/scenes/scene20.cpp
+++ b/engines/fullpipe/scenes/scene20.cpp
@@ -37,7 +37,25 @@
namespace Fullpipe {
void scene20_setExits(Scene *sc) {
- warning("STUB: scene20_setExits()");
+ int thingpar;
+
+ if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnStool)
+ || g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_OnTheFloor))
+ thingpar = 1;
+ else if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipe)
+ || g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) {
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing, 1);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing2, 1);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing3, 0);
+
+ return;
+ } else {
+ thingpar = 0;
+ }
+
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing, thingpar);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing2, 0);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing3, 1);
}
void scene20_initScene(Scene *sc) {
Commit: a48ce090c2413edebd4054304637c4fdc41478f6
https://github.com/scummvm/scummvm/commit/a48ce090c2413edebd4054304637c4fdc41478f6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T06:27:09-08:00
Commit Message:
FULLPIPE: Implement sceneHandler20()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene20.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index e99f883..03c9984 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -725,6 +725,7 @@ namespace Fullpipe {
// Scene 20
#define ANI_GRANDMA_20 2427
+#define MSG_SC20_UPDATELOCKABLE 5217
#define ST_GMA20_FLOOR 2429
#define ST_GMA20_STAND 2436
#define ST_GMA20_STOOL 2432
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp
index 45d5971..d349b25 100644
--- a/engines/fullpipe/scenes/scene20.cpp
+++ b/engines/fullpipe/scenes/scene20.cpp
@@ -98,4 +98,45 @@ void scene20_initScene(Scene *sc) {
g_vars->scene20_var05 = g_fp->_rnd->getRandomNumber(200) + 400;
}
+void sceneHandler20_updateFlies() {
+ warning("STUB: sceneHandler20_updateFlies()");
+}
+
+int sceneHandler20(ExCommand *cmd) {
+ if (cmd->_messageKind != 17)
+ return 0;
+
+ switch (cmd->_messageNum) {
+ case MSG_SC20_UPDATELOCKABLE:
+ scene20_setExits(g_fp->_currentScene);
+ break;
+
+ case 33:
+ if (g_fp->_aniMan2) {
+ int x = g_fp->_aniMan2->_ox;
+
+ if (x < g_fp->_sceneRect.left + g_vars->scene20_var01)
+ g_fp->_currentScene->_x = x - g_vars->scene20_var03 - g_fp->_sceneRect.left;
+
+ if (x > g_fp->_sceneRect.right - g_vars->scene20_var01)
+ g_fp->_currentScene->_x = x + g_vars->scene20_var03 - g_fp->_sceneRect.right;
+ }
+
+ --g_vars->scene20_var05;
+
+ if (g_vars->scene20_var05 <= 0)
+ sceneHandler20_updateFlies();
+
+ g_fp->_floaters->update();
+
+ g_fp->_behaviorManager->updateBehaviors();
+
+ g_fp->startSceneTrack();
+
+ break;
+ }
+
+ return 0;
+}
+
} // End of namespace Fullpipe
Commit: dcfca53aced59c07518e756ac52ddb741fe68c89
https://github.com/scummvm/scummvm/commit/dcfca53aced59c07518e756ac52ddb741fe68c89
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T06:36:42-08:00
Commit Message:
FULLPIPE: Implement sceneHandler20_updateFlies()
Changed paths:
engines/fullpipe/scenes/scene20.cpp
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp
index d349b25..82fc5b6 100644
--- a/engines/fullpipe/scenes/scene20.cpp
+++ b/engines/fullpipe/scenes/scene20.cpp
@@ -99,7 +99,25 @@ void scene20_initScene(Scene *sc) {
}
void sceneHandler20_updateFlies() {
- warning("STUB: sceneHandler20_updateFlies()");
+ int sz = g_fp->_floaters->_array2.size();
+
+ if (sz < 3) {
+ g_fp->_floaters->genFlies(g_fp->_currentScene, 253, 650, 200, 0);
+ g_fp->_floaters->_array2[sz - 1]->val2 = 250;
+ g_fp->_floaters->_array2[sz - 1]->val3 = 200;
+ } else {
+ int idx = g_fp->_rnd->getRandomNumber(sz);
+
+ g_fp->_floaters->_array2[idx]->countdown = 0;
+ g_fp->_floaters->_array2[idx]->fflags |= 4u;
+ g_fp->_floaters->_array2[idx]->val2 = 250;
+ g_fp->_floaters->_array2[idx]->val3 = 200;
+ g_fp->_floaters->_array2[idx]->val6 = 253;
+ g_fp->_floaters->_array2[idx]->val7 = 650;
+ g_fp->_floaters->_array2[idx]->ani->_priority = 200;
+ }
+
+ g_vars->scene20_var05 = g_fp->_rnd->getRandomNumber(200) + 400;
}
int sceneHandler20(ExCommand *cmd) {
Commit: 2636b92af119e418e1585cbfdf2d0717bd4f1d53
https://github.com/scummvm/scummvm/commit/2636b92af119e418e1585cbfdf2d0717bd4f1d53
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T06:39:00-08:00
Commit Message:
FULLPIPE: Renames in scene20
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene20.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 2c67a47..9e990b7 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -247,11 +247,7 @@ Vars::Vars() {
scene17_handPhase = false;
scene17_sceneEdgeX = 0;
- scene20_var01 = 0;
- scene20_var02 = 0;
- scene20_var03 = 0;
- scene20_var04 = 0;
- scene20_var05 = 0;
+ scene20_fliesCountdown = 0;
scene20_grandma = 0;
scene21_giraffeBottom = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 7e30c86..c956883 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -348,11 +348,7 @@ public:
bool scene17_handPhase;
int scene17_sceneEdgeX;
- int scene20_var01;
- int scene20_var02;
- int scene20_var03;
- int scene20_var04;
- int scene20_var05;
+ int scene20_fliesCountdown;
StaticANIObject *scene20_grandma;
StaticANIObject *scene21_giraffeBottom;
diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp
index 82fc5b6..5fed24a 100644
--- a/engines/fullpipe/scenes/scene20.cpp
+++ b/engines/fullpipe/scenes/scene20.cpp
@@ -59,11 +59,6 @@ void scene20_setExits(Scene *sc) {
}
void scene20_initScene(Scene *sc) {
- g_vars->scene20_var01 = 200;
- g_vars->scene20_var02 = 200;
- g_vars->scene20_var03 = 300;
- g_vars->scene20_var04 = 300;
-
Scene *oldsc = g_fp->_currentScene;
g_vars->scene20_grandma = sc->getStaticANIObject1ById(ANI_GRANDMA_20, -1);
@@ -95,7 +90,7 @@ void scene20_initScene(Scene *sc) {
g_fp->_currentScene = oldsc;
- g_vars->scene20_var05 = g_fp->_rnd->getRandomNumber(200) + 400;
+ g_vars->scene20_fliesCountdown = g_fp->_rnd->getRandomNumber(200) + 400;
}
void sceneHandler20_updateFlies() {
@@ -117,7 +112,7 @@ void sceneHandler20_updateFlies() {
g_fp->_floaters->_array2[idx]->ani->_priority = 200;
}
- g_vars->scene20_var05 = g_fp->_rnd->getRandomNumber(200) + 400;
+ g_vars->scene20_fliesCountdown = g_fp->_rnd->getRandomNumber(200) + 400;
}
int sceneHandler20(ExCommand *cmd) {
@@ -133,16 +128,16 @@ int sceneHandler20(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- if (x < g_fp->_sceneRect.left + g_vars->scene20_var01)
- g_fp->_currentScene->_x = x - g_vars->scene20_var03 - g_fp->_sceneRect.left;
+ if (x < g_fp->_sceneRect.left + 200)
+ g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
- if (x > g_fp->_sceneRect.right - g_vars->scene20_var01)
- g_fp->_currentScene->_x = x + g_vars->scene20_var03 - g_fp->_sceneRect.right;
+ if (x > g_fp->_sceneRect.right - 200)
+ g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
- --g_vars->scene20_var05;
+ --g_vars->scene20_fliesCountdown;
- if (g_vars->scene20_var05 <= 0)
+ if (g_vars->scene20_fliesCountdown <= 0)
sceneHandler20_updateFlies();
g_fp->_floaters->update();
Commit: c91f21ff7f2a0010bac1592ab08090fc064f8a80
https://github.com/scummvm/scummvm/commit/c91f21ff7f2a0010bac1592ab08090fc064f8a80
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T06:40:31-08:00
Commit Message:
FULLPIPE: Enable scene20. This completes the scene
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 9e990b7..65d394f 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -651,6 +651,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene19_sub_4211D0(scene);
_updateCursorCallback = scene19_updateCursor;
break;
+#endif
case SC_20:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_20");
@@ -662,7 +663,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
addMessageHandler(sceneHandler20, 2);
_updateCursorCallback = defaultUpdateCursor;
break;
-#endif
case SC_21:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_21");
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index c956883..e3534c8 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -101,6 +101,9 @@ void scene17_restoreState();
int sceneHandler17(ExCommand *cmd);
int scene17_updateCursor();
+void scene20_initScene(Scene *sc);
+int sceneHandler20(ExCommand *ex);
+
int scene21_updateCursor();
void scene21_initScene(Scene *sc);
int sceneHandler21(ExCommand *cmd);
More information about the Scummvm-git-logs
mailing list