[Scummvm-cvs-logs] SF.net SVN: scummvm: [27673] scummvm/trunk/engines/scumm/input.cpp

[fingolfin at users.sourceforge.net]

Revision: 27673
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27673&view=rev
Author:   fingolfin
Date:     2007-06-23 09:05:38 -0700 (Sat, 23 Jun 2007)

Log Message:
-----------
Simplify code: Since processInput() always overwrite the value of lastKeyHit if KEY_ALL_SKIP is seen, we can never encounter KEY_ALL_SKIP at this spot

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/input.cpp

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2007-06-23 16:02:50 UTC (rev 27672)
+++ scummvm/trunk/engines/scumm/input.cpp	2007-06-23 16:05:38 UTC (rev 27673)
@@ -413,7 +413,7 @@
 	// On WinCE we've also got one special for skipping cutscenes or dialog, whatever is appropriate
 	// Since _smushActive is not a member of the base case class ScummEngine::, we detect here if we're
 	// playing a cutscene and skip it; else we forward the keystroke through to ScummEngine::processInput.
-	if (cutsceneExitKeyEnabled && (lastKeyHit.ascii == KEY_ALL_SKIP || lastKeyHit.keycode == Common::KEYCODE_ESCAPE)) {
+	if (cutsceneExitKeyEnabled && lastKeyHit.keycode == Common::KEYCODE_ESCAPE) {
 // FIXME: I do not quite understand why this code behaves differently on WinCE ?!?
 		int bail = 1;
 		if (_smushActive) {


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