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_mr.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_mr.cpp')
-rw-r--r-- | engines/kyra/kyra_mr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 431bdf4109..700bec10b7 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -263,7 +263,7 @@ int KyraEngine_MR::go() { running = false; } - while (running && !_eventMan->shouldQuit()) { + while (running && !quit()) { _screen->_curPage = 0; _screen->clearPage(0); @@ -272,14 +272,14 @@ int KyraEngine_MR::go() { // XXX playMenuAudioFile(); - for (int i = 0; i < 64 && !_eventMan->shouldQuit(); ++i) { + for (int i = 0; i < 64 && !quit(); ++i) { uint32 nextRun = _system->getMillis() + 3 * _tickLength; _menuAnim->displayFrame(i, 0); _screen->updateScreen(); delayUntil(nextRun); } - for (int i = 64; i > 29 && !_eventMan->shouldQuit(); --i) { + for (int i = 64; i > 29 && !quit(); --i) { uint32 nextRun = _system->getMillis() + 3 * _tickLength; _menuAnim->displayFrame(i, 0); _screen->updateScreen(); @@ -987,7 +987,7 @@ void KyraEngine_MR::runLoop() { _eventList.clear(); _runFlag = true; - while (_runFlag && !_eventMan->shouldQuit()) { + while (_runFlag && !quit()) { if (_deathHandler >= 0) { removeHandItem(); delay(5); |