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/queen | |
| 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/queen')
| -rw-r--r-- | engines/queen/logic.cpp | 10 | ||||
| -rw-r--r-- | engines/queen/queen.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/talk.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp index 7fcc761018..053312c584 100644 --- a/engines/queen/logic.cpp +++ b/engines/queen/logic.cpp @@ -2076,7 +2076,7 @@ bool LogicDemo::changeToSpecialRoom() { displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true); playCutaway("CLOGO.CUT"); sceneReset(); - if (_vm->quit()) + if (_vm->shouldQuit()) return true; currentRoom(ROOM_HOTEL_LOBBY); entryObj(584); @@ -2131,10 +2131,10 @@ bool LogicGame::changeToSpecialRoom() { } else if (currentRoom() == FOTAQ_LOGO && gameState(VAR_INTRO_PLAYED) == 0) { displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true); playCutaway("COPY.CUT"); - if (_vm->quit()) + if (_vm->shouldQuit()) return true; playCutaway("CLOGO.CUT"); - if (_vm->quit()) + if (_vm->shouldQuit()) return true; if (_vm->resource()->getPlatform() != Common::kPlatformAmiga) { if (ConfMan.getBool("alt_intro") && _vm->resource()->isCD()) { @@ -2143,10 +2143,10 @@ bool LogicGame::changeToSpecialRoom() { playCutaway("CDINT.CUT"); } } - if (_vm->quit()) + if (_vm->shouldQuit()) return true; playCutaway("CRED.CUT"); - if (_vm->quit()) + if (_vm->shouldQuit()) return true; _vm->display()->palSetPanel(); sceneReset(); diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 6cdd020b8f..e242614ad9 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -437,7 +437,7 @@ int QueenEngine::go() { } _lastSaveTime = _lastUpdateTime = _system->getMillis(); - while (!quit()) { + while (!shouldQuit()) { if (_logic->newRoom() > 0) { _logic->update(); _logic->oldRoom(_logic->currentRoom()); diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index fa2ca669cd..9955ebb856 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -807,7 +807,7 @@ void Talk::speakSegment( switch (command) { case SPEAK_PAUSE: - for (i = 0; i < 10 && !_vm->input()->talkQuit() && !_vm->quit(); i++) { + for (i = 0; i < 10 && !_vm->input()->talkQuit() && !_vm->shouldQuit(); i++) { _vm->update(); } return; |