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

[lordhoto at users.sourceforge.net]

Revision: 43527
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43527&view=rev
Author:   lordhoto
Date:     2009-08-19 07:12:33 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Skip the whole Lore of the Lands special when the user does any input, like the original did.

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

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-08-19 01:41:23 UTC (rev 43526)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-08-19 07:12:33 UTC (rev 43527)
@@ -875,20 +875,15 @@
 			while (sound->voiceIsPlaying() && !_vm->shouldQuit() && !_vm->skipFlag())
 				_vm->delay(10);
 
-			if (_vm->skipFlag()) {
+			if (_vm->skipFlag())
 				sound->voiceStop();
-				_vm->resetSkipFlag();
-			}
 
 			++voiceFilename[4];
 		}
-
-		if (_vm->skipFlag())
-			_vm->resetSkipFlag();
 	}
 
 	if (_vm->skipFlag())
-		_vm->resetSkipFlag();
+		_vm->_eventList.clear();
 
 	pal.fill(0, 256, 63);
 	if (_fireWsa->opened())
@@ -899,6 +894,9 @@
 	_screen->clearPage(0);
 	pal.fill(0, 256, 0);
 	_screen->fadePalette(pal, 0x3C);
+
+	if (_vm->skipFlag())
+		_vm->_eventList.clear();
 }
 
 void HistoryPlayer::loadWsa(const char *filename) {


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