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/saga | |
| 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/saga')
| -rw-r--r-- | engines/saga/introproc_ihnm.cpp | 8 | ||||
| -rw-r--r-- | engines/saga/saga.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/saga/introproc_ihnm.cpp b/engines/saga/introproc_ihnm.cpp index aaa428ca53..685cc5a961 100644 --- a/engines/saga/introproc_ihnm.cpp +++ b/engines/saga/introproc_ihnm.cpp @@ -59,11 +59,11 @@ int Scene::IHNMStartProc() { // Play Cyberdreams logo for 168 frames if (!playTitle(0, logoLength, true)) { - if (_vm->quit()) + if (_vm->shouldQuit()) return !SUCCESS; // Play Dreamers Guild logo for 10 seconds if (!playLoopingTitle(1, 10)) { - if (_vm->quit()) + if (_vm->shouldQuit()) return !SUCCESS; // Play the title music _vm->_music->play(1, MUSIC_NORMAL); @@ -74,7 +74,7 @@ int Scene::IHNMStartProc() { } else { _vm->_music->play(1, MUSIC_NORMAL); playTitle(0, 10); - if (_vm->quit()) + if (_vm->shouldQuit()) return !SUCCESS; playTitle(2, 12); } @@ -193,7 +193,7 @@ bool Scene::playTitle(int title, int time, int mode) { _vm->_gfx->getCurrentPal(pal_cut); - while (!done && !_vm->quit()) { + while (!done && !_vm->shouldQuit()) { curTime = _vm->_system->getMillis(); switch (phase) { diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 5ce5d6ab93..7904e60d1c 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -270,7 +270,7 @@ int SagaEngine::go() { uint32 currentTicks; - while (!quit()) { + while (!shouldQuit()) { if (_console->isAttached()) _console->onFrame(); |