diff options
| author | Eugene Sandulenko | 2013-12-24 18:52:36 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-12-25 09:14:42 +0200 |
| commit | d509744df58a0c6941677279f1525015caf88392 (patch) | |
| tree | a40cfe61ac3b402433ed45cba96b15fe89af7d19 | |
| parent | ee8d6c47237a1c297cc84496e21f7e2cee52b915 (diff) | |
| download | scummvm-rg350-d509744df58a0c6941677279f1525015caf88392.tar.gz scummvm-rg350-d509744df58a0c6941677279f1525015caf88392.tar.bz2 scummvm-rg350-d509744df58a0c6941677279f1525015caf88392.zip | |
FULLPIPE: Plug scene12 in
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 2 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 3 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene12.cpp | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index ebdcf398de..89b0b2d31f 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 53cabed166..270c2038b0 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 c5e03917d5..da685a1863 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() { |