aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-02-05 19:25:52 +0000
committerJohannes Schickel2009-02-05 19:25:52 +0000
commit7c0a16e422649b3b7250264464777b4562e41a8a (patch)
tree2ea1c848962ea6f0d4d188c59168ba8d30659d04
parent627241de8582e48c95da75b982a59a1773401ad5 (diff)
downloadscummvm-rg350-7c0a16e422649b3b7250264464777b4562e41a8a.tar.gz
scummvm-rg350-7c0a16e422649b3b7250264464777b4562e41a8a.tar.bz2
scummvm-rg350-7c0a16e422649b3b7250264464777b4562e41a8a.zip
Allow ScummVM to quit while a character is talking in Kyra3.
svn-id: r36221
-rw-r--r--engines/kyra/text_mr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp
index b8ccfc106a..57bf717906 100644
--- a/engines/kyra/text_mr.cpp
+++ b/engines/kyra/text_mr.cpp
@@ -354,7 +354,7 @@ void KyraEngine_MR::objectChatWaitToFinish() {
_emc->start(&_chatScriptState, 1);
_animNeedUpdate = false;
- while (!_animNeedUpdate && _emc->isValid(&_chatScriptState)) {
+ while (!_animNeedUpdate && _emc->isValid(&_chatScriptState) && !shouldQuit()) {
musicUpdate(0);
_emc->run(&_chatScriptState);
}
@@ -861,7 +861,7 @@ void KyraEngine_MR::npcChatSequence(const char *str, int object, int vocHigh, in
uint32 endTime = _chatEndTime;
bool running = true;
- while (running) {
+ while (running && !shouldQuit()) {
if (!_emc->run(&_dialogScriptState)) {
_emc->init(&_dialogScriptState, &_dialogScriptData);
_emc->start(&_dialogScriptState, _dialogScriptFuncProc);