From 5688a393b420a8f3ba83444c44bebcff47c7339a Mon Sep 17 00:00:00 2001
From: Julien Templier
Date: Wed, 27 Oct 2010 19:19:57 +0000
Subject: LASTEXPRESS: Do not try to show intro when loading a game

svn-id: r53882
---
 engines/lastexpress/game/menu.cpp | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'engines/lastexpress/game')

diff --git a/engines/lastexpress/game/menu.cpp b/engines/lastexpress/game/menu.cpp
index 537162e6bf..1bdb9ac5ac 100644
--- a/engines/lastexpress/game/menu.cpp
+++ b/engines/lastexpress/game/menu.cpp
@@ -692,35 +692,37 @@ bool Menu::handleEvent(StartMenuAction action, Common::EventType type) {
 		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));
+
+						if (!getFlags()->mouseRightClick) {
+							getSound()->processEntry(SoundManager::kSoundType11);
 
-						// Show intro
-						Animation animation;
-						if (animation.load(getArchive("1601.nis")))
-							animation.play();
+							// Show intro
+							Animation animation;
+							if (animation.load(getArchive("1601.nis")))
+								animation.play();
 
-						getEvent(kEventIntro) = 1;
+							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
-- 
cgit v1.2.3