diff options
| author | Filippos Karapetis | 2014-10-27 03:36:52 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-10-27 03:36:52 +0200 |
| commit | b5b5417d64eacd21d441631e7a5e0c618bfadebd (patch) | |
| tree | 7e5495587e1565351f25e9b377fedf39ff62915c /engines/queen | |
| parent | 0db09d334ca1be244aa6b5865ff92919456c669f (diff) | |
| download | scummvm-rg350-b5b5417d64eacd21d441631e7a5e0c618bfadebd.tar.gz scummvm-rg350-b5b5417d64eacd21d441631e7a5e0c618bfadebd.tar.bz2 scummvm-rg350-b5b5417d64eacd21d441631e7a5e0c618bfadebd.zip | |
QUEEN: Allow the engine to quit while dialog options are shown
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/talk.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index d00e64b777..e86a53d448 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -189,7 +189,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) { } } - if (_vm->input()->talkQuit()) + if (_vm->input()->talkQuit() || _vm->shouldQuit()) break; retval = _dialogueTree[level][selectedSentence].dialogueNodeValue1; @@ -1255,11 +1255,7 @@ int16 Talk::selectSentence() { if (sentenceCount > 0) { int oldZone = 0; - while (0 == selectedSentence) { - - if (_vm->input()->talkQuit()) - break; - + while (0 == selectedSentence && !_vm->input()->talkQuit() && !_vm->shouldQuit()) { _vm->update(); Common::Point mouse = _vm->input()->getMousePos(); |