diff options
| author | Willem Jan Palenstijn | 2015-05-14 16:55:10 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-05-14 16:55:10 +0200 |
| commit | 8919a8e8418a5dddaafda11b32c2d798ce8d8a40 (patch) | |
| tree | 4a18a1d7614d169e6d0c3b5edce3b4624f811176 /engines/saga/scene.cpp | |
| parent | 8466c0f08da9b00408e6829ee948a62ec411de9d (diff) | |
| download | scummvm-rg350-8919a8e8418a5dddaafda11b32c2d798ce8d8a40.tar.gz scummvm-rg350-8919a8e8418a5dddaafda11b32c2d798ce8d8a40.tar.bz2 scummvm-rg350-8919a8e8418a5dddaafda11b32c2d798ce8d8a40.zip | |
SAGA: Avoid code duplication
Diffstat (limited to 'engines/saga/scene.cpp')
| -rw-r--r-- | engines/saga/scene.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 9160131349..4fa15d09e5 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -835,13 +835,14 @@ void Scene::loadScene(LoadSceneParams &loadSceneParams) { loadSceneParams.sceneProc(SCENE_BEGIN, this); } - // We probably don't want "followers" to go into scene -1 , 0. At the very - // least we don't want garbage to be drawn that early in the ITE intro. - if (_sceneNumber > 0 && !(_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE)) - _vm->_actor->updateActorsScene(loadSceneParams.actorsEntrance); - - if (_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE) + if (_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE) { _vm->_puzzle->execute(); + } else { + // We probably don't want "followers" to go into scene -1 , 0. At the very + // least we don't want garbage to be drawn that early in the ITE intro. + if (_sceneNumber > 0) + _vm->_actor->updateActorsScene(loadSceneParams.actorsEntrance); + } if (getFlags() & kSceneFlagShowCursor) { // Activate user interface |