diff options
author | Max Horn | 2008-09-30 12:27:38 +0000 |
---|---|---|
committer | Max Horn | 2008-09-30 12:27:38 +0000 |
commit | 9b160804ab8878b55efb032fb62ee359ab97f848 (patch) | |
tree | aa0ac6d0aec815de5f2368acc00971948cf3fa0b /engines/kyra/kyra_mr.cpp | |
parent | 87917e06d94e36c483011deaf1eb4a5dba6eeb97 (diff) | |
download | scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.gz scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.bz2 scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.zip |
Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
Diffstat (limited to 'engines/kyra/kyra_mr.cpp')
-rw-r--r-- | engines/kyra/kyra_mr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 9d3171e723..7dea56a5fa 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 && !quit()) { + while (running && !shouldQuit()) { _screen->_curPage = 0; _screen->clearPage(0); @@ -272,14 +272,14 @@ int KyraEngine_MR::go() { // XXX playMenuAudioFile(); - for (int i = 0; i < 64 && !quit(); ++i) { + for (int i = 0; i < 64 && !shouldQuit(); ++i) { uint32 nextRun = _system->getMillis() + 3 * _tickLength; _menuAnim->displayFrame(i, 0); _screen->updateScreen(); delayUntil(nextRun); } - for (int i = 64; i > 29 && !quit(); --i) { + for (int i = 64; i > 29 && !shouldQuit(); --i) { uint32 nextRun = _system->getMillis() + 3 * _tickLength; _menuAnim->displayFrame(i, 0); _screen->updateScreen(); @@ -1001,7 +1001,7 @@ void KyraEngine_MR::runLoop() { _eventList.clear(); _runFlag = true; - while (_runFlag && !quit()) { + while (_runFlag && !shouldQuit()) { if (_deathHandler >= 0) { removeHandItem(); delay(5); @@ -1009,7 +1009,7 @@ void KyraEngine_MR::runLoop() { _gui->optionsButton(0); _deathHandler = -1; - if (quit()) + if (shouldQuit()) break; } |