diff options
author | Christopher Page | 2008-07-08 05:02:45 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-08 05:02:45 +0000 |
commit | b97f39019cff74f7211152c78e4777ca0e31826e (patch) | |
tree | b5af4c3ff334885229742d9d01269c4c2fa58630 /engines/kyra/sequences_lok.cpp | |
parent | 3beccaf11591f4eef4a53993d656f1438f614a9c (diff) | |
download | scummvm-rg350-b97f39019cff74f7211152c78e4777ca0e31826e.tar.gz scummvm-rg350-b97f39019cff74f7211152c78e4777ca0e31826e.tar.bz2 scummvm-rg350-b97f39019cff74f7211152c78e4777ca0e31826e.zip |
KYRA works with the new GMM implementation
svn-id: r32957
Diffstat (limited to 'engines/kyra/sequences_lok.cpp')
-rw-r--r-- | engines/kyra/sequences_lok.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 4fa7acfb1b..73cf634826 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -164,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) || _eventMan->shouldQuit()) { _screen->fadeToBlack(); _screen->clearPage(0); return; @@ -176,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()) || _eventMan->shouldQuit()) { _screen->fadeToBlack(); _screen->clearPage(0); return; } _screen->fillRect(0, 179, 319, 199, 0); - if (_quit) + if (_eventMan->shouldQuit()) return; if (_flags.platform == Common::kPlatformAmiga) { @@ -223,10 +223,10 @@ void KyraEngine_LoK::seq_introLogos() { oldDistance = distance; delay(10); - } while (!doneFlag && !_quit && !_abortIntroFlag); + } while (!doneFlag && !_eventMan->shouldQuit() && !_abortIntroFlag); } - if (_quit) + if (_eventMan->shouldQuit()) return; _seq->playSequence(_seq_Forest, true); @@ -1030,7 +1030,7 @@ void KyraEngine_LoK::seq_brandonToStone() { void KyraEngine_LoK::seq_playEnding() { debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playEnding()"); - if (_quit) + if (_eventMan->shouldQuit()) return; _screen->hideMouse(); _screen->_curPage = 0; @@ -1187,7 +1187,6 @@ void KyraEngine_LoK::seq_playCredits() { finished = true; break; case Common::EVENT_QUIT: - quitGame(); finished = true; break; default: @@ -1211,7 +1210,7 @@ void KyraEngine_LoK::seq_playCredits() { bool KyraEngine_LoK::seq_skipSequence() const { debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_skipSequence()"); - return _quit || _abortIntroFlag; + return _eventMan->shouldQuit() || _abortIntroFlag; } int KyraEngine_LoK::handleMalcolmFlag() { |