libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA: Avoid code duplication

Browse Source
This commit is contained in:
Willem Jan Palenstijn 2015-05-14 16:55:10 +02:00
parent 8466c0f08d
commit 8919a8e841
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/saga/scene.cpp
View File

@ -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