aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-13 18:35:42 +0000
committerJohannes Schickel2009-09-13 18:35:42 +0000
commita2900bf2460993b1d96cb7b67473415db49c53e0 (patch)
tree58f1353dc9c29d436f8f3e9466fa13c61bde25df /engines/kyra
parent525c0844566b070d6070b4b441553a0b262a7786 (diff)
downloadscummvm-rg350-a2900bf2460993b1d96cb7b67473415db49c53e0.tar.gz
scummvm-rg350-a2900bf2460993b1d96cb7b67473415db49c53e0.tar.bz2
scummvm-rg350-a2900bf2460993b1d96cb7b67473415db49c53e0.zip
Fix bug when skipping Kyrandia 1 Intro, when no restart save game file is present.
svn-id: r44062
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/kyra_lok.cpp6
1 files changed, 3 insertions, 3 deletions
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();