[Scummvm-cvs-logs] SF.net SVN: scummvm:[53882] scummvm/trunk/engines/lastexpress/game/menu.cpp

[littleboy at users.sourceforge.net]

Revision: 53882
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53882&view=rev
Author:   littleboy
Date:     2010-10-27 19:19:57 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Do not try to show intro when loading a game

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/game/menu.cpp

Modified: scummvm/trunk/engines/lastexpress/game/menu.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/menu.cpp	2010-10-27 19:19:38 UTC (rev 53881)
+++ scummvm/trunk/engines/lastexpress/game/menu.cpp	2010-10-27 19:19:57 UTC (rev 53882)
@@ -692,35 +692,37 @@
 		getSavePoints()->reset();
 		setLogicEventHandlers();
 
-		getSound()->processEntry(SoundManager::kSoundType11);
-
-		if (!getFlags()->mouseRightClick) {
-			getScenes()->loadScene((SceneIndex)(5 * _gameId + 3));
-
+		if (_index) {
+			getSound()->processEntry(SoundManager::kSoundType11);
+		} else {
 			if (!getFlags()->mouseRightClick) {
-				getScenes()->loadScene((SceneIndex)(5 * _gameId + 4));
+				getScenes()->loadScene((SceneIndex)(5 * _gameId + 3));
 
 				if (!getFlags()->mouseRightClick) {
-					getScenes()->loadScene((SceneIndex)(5 * _gameId + 5));
+					getScenes()->loadScene((SceneIndex)(5 * _gameId + 4));
 
 					if (!getFlags()->mouseRightClick) {
-						getSound()->processEntry(SoundManager::kSoundType11);
+						getScenes()->loadScene((SceneIndex)(5 * _gameId + 5));
 
-						// Show intro
-						Animation animation;
-						if (animation.load(getArchive("1601.nis")))
-							animation.play();
+						if (!getFlags()->mouseRightClick) {
+							getSound()->processEntry(SoundManager::kSoundType11);
 
-						getEvent(kEventIntro) = 1;
+							// Show intro
+							Animation animation;
+							if (animation.load(getArchive("1601.nis")))
+								animation.play();
+
+							getEvent(kEventIntro) = 1;
+						}
 					}
 				}
 			}
-		}
 
-		if (!getEvent(kEventIntro))	{
-			getEvent(kEventIntro) = 1;
+			if (!getEvent(kEventIntro))	{
+				getEvent(kEventIntro) = 1;
 
-			getSound()->processEntry(SoundManager::kSoundType11);
+				getSound()->processEntry(SoundManager::kSoundType11);
+			}
 		}
 
 		// Setup game


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.