aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-08-29 07:52:45 +0000
committerJohannes Schickel2009-08-29 07:52:45 +0000
commit64489c3f215f31cbc9821811afe78bfdfbf82f55 (patch)
treeaa7794ccbe1cf10a43a96df63e21d132973d9400
parentadf1df19c0a002123946379b3bfb1f537a66c869 (diff)
downloadscummvm-rg350-64489c3f215f31cbc9821811afe78bfdfbf82f55.tar.gz
scummvm-rg350-64489c3f215f31cbc9821811afe78bfdfbf82f55.tar.bz2
scummvm-rg350-64489c3f215f31cbc9821811afe78bfdfbf82f55.zip
Fix regression, which caused skipping of some dialogue lines to fail in Kyrandia 1.
svn-id: r43794
-rw-r--r--engines/kyra/kyra_lok.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 9dbe5b9699..4ff7707641 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -469,7 +469,7 @@ void KyraEngine_LoK::mainLoop() {
}
void KyraEngine_LoK::delayUntil(uint32 timestamp, bool updateTimers, bool update, bool isMainLoop) {
- while (_system->getMillis() < timestamp && !shouldQuit()) {
+ while (_system->getMillis() < timestamp && !shouldQuit() && !skipFlag()) {
if (updateTimers)
_timer->update();