[Scummvm-cvs-logs] scummvm master -> 8919a8e8418a5dddaafda11b32c2d798ce8d8a40

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8919a8e841 SAGA: Avoid code duplication


Commit: 8919a8e8418a5dddaafda11b32c2d798ce8d8a40
    https://github.com/scummvm/scummvm/commit/8919a8e8418a5dddaafda11b32c2d798ce8d8a40
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-05-14T16:55:10+02:00

Commit Message:
SAGA: Avoid code duplication

Changed paths:
    engines/saga/scene.cpp



diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index 9160131..4fa15d0 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