[Scummvm-cvs-logs] SF.net SVN: scummvm:[45732] scummvm/branches/branch-1-0-0/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 45732
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45732&view=rev
Author:   lordhoto
Date:     2009-11-07 15:10:14 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
Backport of r45731: "Fix some delays in Kyrandia 1 when clicking very often, while a sequence plays."

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp
    scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.h

Modified: scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp	2009-11-07 15:06:49 UTC (rev 45731)
+++ scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.cpp	2009-11-07 15:10:14 UTC (rev 45732)
@@ -509,6 +509,14 @@
 	return KyraEngine_v1::skipFlag() || shouldQuit();
 }
 
+void KyraEngine_LoK::resetSkipFlag(bool removeEvent) {
+	if (removeEvent) {
+		_eventList.clear();
+	} else {
+		KyraEngine_v1::resetSkipFlag(false);
+	}
+}
+
 void KyraEngine_LoK::delayWithTicks(int ticks) {
 	uint32 nextTime = _system->getMillis() + ticks * _tickLength;
 

Modified: scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.h	2009-11-07 15:06:49 UTC (rev 45731)
+++ scummvm/branches/branch-1-0-0/engines/kyra/kyra_lok.h	2009-11-07 15:10:14 UTC (rev 45732)
@@ -200,6 +200,7 @@
 	void delayWithTicks(int ticks);
 
 	bool skipFlag() const;
+	void resetSkipFlag(bool removeEvent = true);
 
 	// TODO
 	void registerDefaultSettings();


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