diff options
Diffstat (limited to 'engines/kyra/sequences_lok.cpp')
-rw-r--r-- | engines/kyra/sequences_lok.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 77cfbed2d0..3a497a258f 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -34,6 +34,7 @@ #include "kyra/text.h" #include "kyra/timer.h" +#include "common/events.h" #include "common/system.h" #include "common/savefile.h" @@ -163,7 +164,7 @@ void KyraEngine_LoK::seq_introLogos() { _screen->updateScreen(); _screen->fadeFromBlack(); - if (_seq->playSequence(_seq_WestwoodLogo, _skipFlag) || quit()) { + if (_seq->playSequence(_seq_WestwoodLogo, _skipFlag) || _quitFlag) { _screen->fadeToBlack(); _screen->clearPage(0); return; @@ -175,14 +176,14 @@ void KyraEngine_LoK::seq_introLogos() { _screen->setScreenPalette(_screen->_currentPalette); } - if ((_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence()) || quit()) { + if ((_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence()) || _quitFlag) { _screen->fadeToBlack(); _screen->clearPage(0); return; } _screen->fillRect(0, 179, 319, 199, 0); - if (quit()) + if (_quitFlag) return; if (_flags.platform == Common::kPlatformAmiga) { @@ -222,10 +223,10 @@ void KyraEngine_LoK::seq_introLogos() { oldDistance = distance; delay(10); - } while (!doneFlag && !quit() && !_abortIntroFlag); + } while (!doneFlag && !_quitFlag && !_abortIntroFlag); } - if (quit()) + if (_quitFlag) return; _seq->playSequence(_seq_Forest, true); @@ -1029,7 +1030,7 @@ void KyraEngine_LoK::seq_brandonToStone() { void KyraEngine_LoK::seq_playEnding() { debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playEnding()"); - if (quit()) + if (_quitFlag) return; _screen->hideMouse(); _screen->_curPage = 0; @@ -1185,8 +1186,8 @@ void KyraEngine_LoK::seq_playCredits() { case Common::EVENT_KEYDOWN: finished = true; break; - case Common::EVENT_RTL: case Common::EVENT_QUIT: + quitGame(); finished = true; break; default: @@ -1210,7 +1211,7 @@ void KyraEngine_LoK::seq_playCredits() { bool KyraEngine_LoK::seq_skipSequence() const { debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_skipSequence()"); - return quit() || _abortIntroFlag; + return _quitFlag || _abortIntroFlag; } int KyraEngine_LoK::handleMalcolmFlag() { |