aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-03-05 22:59:21 +0200
committerEugene Sandulenko2014-03-05 23:02:55 +0200
commiteddf87f5485a80cfd1d83f477bb258a5ad399b95 (patch)
tree1205ddd0b4f9e94f1996f75088cb6366b22d5ce0
parentafda517c3d36fbfa8c34f1fee8d6e3c877974103 (diff)
downloadscummvm-rg350-eddf87f5485a80cfd1d83f477bb258a5ad399b95.tar.gz
scummvm-rg350-eddf87f5485a80cfd1d83f477bb258a5ad399b95.tar.bz2
scummvm-rg350-eddf87f5485a80cfd1d83f477bb258a5ad399b95.zip
FULLPIPE: Enable scene18 and scene19
-rw-r--r--engines/fullpipe/scenes.cpp8
-rw-r--r--engines/fullpipe/scenes.h12
2 files changed, 15 insertions, 5 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 2844ad4dcc..1c6369341a 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -795,7 +795,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
_updateCursorCallback = scene17_updateCursor;
break;
-#if 0
case SC_18:
scene18_setupEntrance();
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_18");
@@ -817,10 +816,10 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
case SC_19:
if (!g_fp->_scene3) {
g_fp->_scene3 = accessScene(SC_18);
- getGameLoader()->loadScene(SC_18);
- scene18_initScene2(g_scene3);
+ g_fp->_gameLoader->loadScene(SC_18);
+ scene18_initScene2(g_fp->_scene3);
scene18_preload();
- scene19_setMovements(g_scene3, entrance->field_4);
+ scene19_setMovements(g_fp->_scene3, entrance->_field_4);
g_vars->scene18_var01 = 1;
}
@@ -841,7 +840,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene19_setSugarState(scene);
_updateCursorCallback = scene19_updateCursor;
break;
-#endif
case SC_20:
sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_20");
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 6a74538f0c..30306fa9ab 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -110,7 +110,19 @@ int sceneHandler17(ExCommand *cmd);
int scene17_updateCursor();
void scene18_preload();
+void scene18_setupEntrance();
+void scene18_initScene1(Scene *sc);
+void scene18_initScene2(Scene *sc);
+int sceneHandler18(ExCommand *cmd);
+int scene18_updateCursor();
+
+void scene19_preload();
+void scene19_setMovements(Scene *sc, int entranceId);
+void scene19_initScene2();
void scene19_setMovements(Scene *sc, int key);
+int sceneHandler19(ExCommand *cmd);
+int scene19_updateCursor();
+void scene19_setSugarState(Scene *sc);
void scene20_initScene(Scene *sc);
int sceneHandler20(ExCommand *ex);