[Scummvm-cvs-logs] SF.net SVN: scummvm: [27674] scummvm/trunk/engines/scumm/input.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jun 23 18:07:39 CEST 2007
Revision: 27674
http://scummvm.svn.sourceforge.net/scummvm/?rev=27674&view=rev
Author: fingolfin
Date: 2007-06-23 09:07:38 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Removing WinCE specific code in ScummEngine_v7::processKeyboard -- it made no sense at all. If this breaks something, please contact me so that we can properly fix it together
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:05:38 UTC (rev 27673)
+++ scummvm/trunk/engines/scumm/input.cpp 2007-06-23 16:07:38 UTC (rev 27674)
@@ -394,7 +394,6 @@
const bool cutsceneExitKeyEnabled = (VAR_CUTSCENEEXIT_KEY != 0xFF && VAR(VAR_CUTSCENEEXIT_KEY) != 0);
-#ifndef _WIN32_WCE
if (cutsceneExitKeyEnabled && lastKeyHit.keycode == Common::KEYCODE_ESCAPE) {
// Skip cutscene (or active SMUSH video).
if (_smushActive) {
@@ -409,31 +408,6 @@
_mouseAndKeyboardStat = Common::ASCII_ESCAPE;
return;
}
-#else
- // 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.keycode == Common::KEYCODE_ESCAPE) {
-// FIXME: I do not quite understand why this code behaves differently on WinCE ?!?
- int bail = 1;
- if (_smushActive) {
- if (_game.id == GID_FT) {
- _insane->escapeKeyHandler();
- bail = 0;
- } else
- _smushVideoShouldFinish = true;
- }
- if ((!_smushActive && vm.cutScenePtr[vm.cutSceneStackPointer]) || _smushVideoShouldFinish) {
- abortCutscene();
- bail = 0;
- }
- if (!bail) {
- _mouseAndKeyboardStat = Common::ASCII_ESCAPE;
- return;
- }
-
- }
-#endif
// Fall back to V6 behavior
ScummEngine_v6::processKeyboard(lastKeyHit);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list