aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);