From a2900bf2460993b1d96cb7b67473415db49c53e0 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 13 Sep 2009 18:35:42 +0000
Subject: Fix bug when skipping Kyrandia 1 Intro, when no restart save game
 file is present.

svn-id: r44062
---
 engines/kyra/kyra_lok.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/kyra')

diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 583100e485..c8d799bfed 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -309,6 +309,7 @@ Common::Error KyraEngine_LoK::go() {
 			setGameFlag(0xEF);
 			_seqPlayerFlag = true;
 			seq_intro();
+			_seqPlayerFlag = false;
 
 			if (_flags.isDemo) {
 				_screen->fadeToBlack();
@@ -318,9 +319,8 @@ Common::Error KyraEngine_LoK::go() {
 			if (shouldQuit())
 				return Common::kNoError;
 
-			if (_skipIntroFlag && _abortIntroFlag)
+			if (_skipIntroFlag && _abortIntroFlag && saveFileLoadable(0))
 				resetGameFlag(0xEF);
-			_seqPlayerFlag = false;
 		}
 		_eventList.clear();
 		startup();
@@ -401,7 +401,7 @@ void KyraEngine_LoK::startup() {
 	snd_playTheme(1, -1);
 	if (_gameToLoad == -1) {
 		enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
-		if (_abortIntroFlag && _skipIntroFlag) {
+		if (_abortIntroFlag && _skipIntroFlag && saveFileLoadable(0)) {
 			_menuDirectlyToLoad = true;
 			_screen->setMouseCursor(1, 1, _shapes[0]);
 			_screen->showMouse();
-- 
cgit v1.2.3