[Scummvm-cvs-logs] SF.net SVN: scummvm:[43794] scummvm/trunk/engines/kyra/kyra_lok.cpp

[lordhoto at users.sourceforge.net]

Revision: 43794
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43794&view=rev
Author:   lordhoto
Date:     2009-08-29 07:52:45 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
Fix regression, which caused skipping of some dialogue lines to fail in Kyrandia 1.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.cpp

Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-08-29 07:52:24 UTC (rev 43793)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-08-29 07:52:45 UTC (rev 43794)
@@ -469,7 +469,7 @@
 }
 
 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();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.