libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 11:41:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUEEN: Allow the engine to quit while dialog options are shown

Browse Source
This commit is contained in:
Filippos Karapetis 2014-10-27 03:36:52 +02:00
parent 0db09d334c
commit b5b5417d64
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/queen/talk.cpp
View File

@ -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();