[Scummvm-cvs-logs] SF.net SVN: scummvm:[44064] scummvm/branches/branch-1-0-0/engines/kyra/ kyra_lok.cpp

[lordhoto at users.sourceforge.net]

Revision: 44064
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44064&view=rev
Author:   lordhoto
Date:     2009-09-13 18:41:52 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
Backport of r44062: "Fix bug when skipping Kyrandia 1 Intro, when no restart save game file is present."

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp	2009-09-13 18:37:19 UTC (rev 44063)
+++ scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp	2009-09-13 18:41:52 UTC (rev 44064)
@@ -304,11 +304,13 @@
 			setGameFlag(0xEF);
 			_seqPlayerFlag = true;
 			seq_intro();
+			_seqPlayerFlag = false;
+
 			if (shouldQuit())
 				return Common::kNoError;
-			if (_skipIntroFlag && _abortIntroFlag)
+
+			if (_skipIntroFlag && _abortIntroFlag && saveFileLoadable(0))
 				resetGameFlag(0xEF);
-			_seqPlayerFlag = false;
 		}
 		_eventList.clear();
 		startup();
@@ -386,7 +388,7 @@
 	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();


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