diff options
author | Eugene Sandulenko | 2014-01-05 16:56:44 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2014-01-05 17:13:32 +0200 |
commit | 744e5b7663253c39d7d0d7695f23984899dacaba (patch) | |
tree | 81dacbc00872dac14ce37315564538eac4907b0b | |
parent | 70bcb0dad327b0d3ac8ba8ab8081016ccbaa49a7 (diff) | |
download | scummvm-rg350-744e5b7663253c39d7d0d7695f23984899dacaba.tar.gz scummvm-rg350-744e5b7663253c39d7d0d7695f23984899dacaba.tar.bz2 scummvm-rg350-744e5b7663253c39d7d0d7695f23984899dacaba.zip |
FULLPIPE: Enable scene25
-rw-r--r-- | engines/fullpipe/scenes.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/scenes.h | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 2213d1dfa4..589a390737 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -743,19 +743,19 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) { _updateCursorCallback = defaultUpdateCursor; break; -#if 0 case SC_25: sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_25"); scene->preloadMovements(sceneVar); - scene25_initScene(scene, entrance->field_4); + scene25_initScene(scene, entrance->_field_4); _behaviorManager->initBehavior(scene, sceneVar); scene->initObjectCursors("SC_25"); setSceneMusicParameters(sceneVar); addMessageHandler(sceneHandler25, 2); - scene25_sub_4253B0(scene, entrance->field_4); + scene25_setupWater(scene, entrance->_field_4); _updateCursorCallback = scene25_updateCursor; break; +#if 0 case SC_26: sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_26"); scene->preloadMovements(sceneVar); diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 72150fc91c..7f3918b119 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -122,8 +122,13 @@ void scene24_initScene(Scene *sc); void scene24_setPoolState(); int sceneHandler24(ExCommand *cmd); +void scene25_initScene(Scene *sc, int entrance); +void scene25_setupWater(Scene *sc, int entrance); +int sceneHandler25(ExCommand *cmd); +int scene25_updateCursor(); + int scene30_updateCursor(); - void scene30_initScene(Scene *sc, int flag); +void scene30_initScene(Scene *sc, int flag); int sceneHandler30(ExCommand *cmd); void scene31_initScene(Scene *sc); |