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

[athrxx at users.sourceforge.net]

Revision: 31232
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31232&view=rev
Author:   athrxx
Date:     2008-03-24 16:01:51 -0700 (Mon, 24 Mar 2008)

Log Message:
-----------
fixed skip flag reset for sequence player

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

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-24 14:21:06 UTC (rev 31231)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-24 23:01:51 UTC (rev 31232)
@@ -300,18 +300,9 @@
 		}
 
 		if (_menuChoice) {
-			uint32 e = _system->getMillis() + 1000;
-			// something is still wrong here
-			// clearing the flag shouldn't be difficult like this
-			while (skipFlag() && _system->getMillis() < e) {
-				resetSkipFlag(true);
-				delay(10);
-			}
 			_abortIntroFlag = false;
+			_eventList.clear();
 
-			if (skipFlag())
-				warning("skip flag could not be reset");
-
 			if (_menuChoice == 2) {
 				seqNum = kSequenceTitle;				
 				_menuChoice = 0;


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