diff options
author | Christopher Page | 2008-07-08 06:00:39 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-08 06:00:39 +0000 |
commit | b8fe71e7a12e60f0c19fa86da83f270dc09e14fd (patch) | |
tree | d94aa645b95cd237f53713c5ead37ab196af38de /engines/kyra/kyra_lok.cpp | |
parent | 94beb3037e55803dd45e5720af8320f0ebccb9ac (diff) | |
download | scummvm-rg350-b8fe71e7a12e60f0c19fa86da83f270dc09e14fd.tar.gz scummvm-rg350-b8fe71e7a12e60f0c19fa86da83f270dc09e14fd.tar.bz2 scummvm-rg350-b8fe71e7a12e60f0c19fa86da83f270dc09e14fd.zip |
Updated KYRA to work with the new GMM implementation
svn-id: r32959
Diffstat (limited to 'engines/kyra/kyra_lok.cpp')
-rw-r--r-- | engines/kyra/kyra_lok.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 6525d3cfbe..747513cc52 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -300,7 +300,7 @@ int KyraEngine_LoK::go() { if (_gameToLoad == -1) { setGameFlag(0xEF); seq_intro(); - if (_eventMan->shouldQuit()) + if (quit()) return _eventMan->shouldRTL(); if (_skipIntroFlag && _abortIntroFlag) resetGameFlag(0xEF); @@ -399,7 +399,7 @@ void KyraEngine_LoK::startup() { void KyraEngine_LoK::mainLoop() { debugC(9, kDebugLevelMain, "KyraEngine_LoK::mainLoop()"); - while (!_eventMan->shouldQuit()) { + while (!quit()) { int32 frameTime = (int32)_system->getMillis(); _skipFlag = false; @@ -444,7 +444,7 @@ void KyraEngine_LoK::mainLoop() { } void KyraEngine_LoK::delayUntil(uint32 timestamp, bool updateTimers, bool update, bool isMainLoop) { - while (_system->getMillis() < timestamp && !_eventMan->shouldQuit()) { + while (_system->getMillis() < timestamp && !quit()) { if (updateTimers) _timer->update(); @@ -526,19 +526,19 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) { if (_skipFlag && !_abortIntroFlag && !queryGameFlag(0xFE)) _skipFlag = false; - if (amount > 0 && !_skipFlag && !_eventMan->shouldQuit()) + if (amount > 0 && !_skipFlag && !quit()) _system->delayMillis(10); if (_skipFlag) _sound->voiceStop(); - } while (!_skipFlag && _system->getMillis() < start + amount && !_eventMan->shouldQuit()); + } while (!_skipFlag && _system->getMillis() < start + amount && !quit()); } void KyraEngine_LoK::waitForEvent() { bool finished = false; Common::Event event; - while (!finished && !_eventMan->shouldQuit()) { + while (!finished && !quit()) { while (_eventMan->pollEvent(event)) { switch (event.type) { case Common::EVENT_KEYDOWN: |