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

[fingolfin at users.sourceforge.net]

Revision: 24164
          http://svn.sourceforge.net/scummvm/?rev=24164&view=rev
Author:   fingolfin
Date:     2006-10-07 05:19:28 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Renemaed ScummEngine::processKbd to processInput (as it also deals with the mouse)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/intern_he.h
    scummvm/trunk/engines/scumm/input.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/scumm.h
    scummvm/trunk/engines/scumm/smush/smush_player.cpp

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2006-10-07 11:54:50 UTC (rev 24163)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2006-10-07 12:19:28 UTC (rev 24164)
@@ -467,7 +467,7 @@
 	virtual void scummLoop_handleDrawing();
 	virtual void runBootscript();
 
-	virtual void processKbd(bool smushMode);
+	virtual void processInput(bool smushMode);
 	virtual void clearClickedStatus();
 
 	virtual void saveOrLoad(Serializer *s);

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2006-10-07 11:54:50 UTC (rev 24163)
+++ scummvm/trunk/engines/scumm/input.cpp	2006-10-07 12:19:28 UTC (rev 24164)
@@ -202,11 +202,11 @@
 	}
 }
 
-void ScummEngine_v90he::processKbd(bool smushMode) {
+void ScummEngine_v90he::processInput(bool smushMode) {
 	if (_game.heversion >= 98) {
 		_logicHE->processKeyStroke(_keyPressed);
 	}
-	ScummEngine::processKbd(smushMode);
+	ScummEngine::processInput(smushMode);
 }
 #endif
 
@@ -218,7 +218,7 @@
 	_rightBtnPressed &= ~msClicked;
 }
 
-void ScummEngine::processKbd(bool smushMode) {
+void ScummEngine::processInput(bool smushMode) {
 	int saveloadkey;
 
 	_lastKeyHit = _keyPressed;
@@ -300,16 +300,6 @@
 	_leftBtnPressed &= ~msClicked;
 	_rightBtnPressed &= ~msClicked;
 
-	if (!_lastKeyHit)
-		return;
-
-	// If a key script was specified (a V8 feature), and it's trigger
-	// key was pressed, run it.
-	if (_keyScriptNo && (_keyScriptKey == _lastKeyHit)) {
-		runScript(_keyScriptNo, 0, 0, 0);
-		return;
-	}
-
 #ifdef _WIN32_WCE
 	if (_lastKeyHit == KEY_ALL_SKIP) {
 		// Skip cutscene
@@ -325,6 +315,16 @@
 	}
 #endif
 
+	if (!_lastKeyHit)
+		return;
+
+	// If a key script was specified (a V8 feature), and it's trigger
+	// key was pressed, run it.
+	if (_keyScriptNo && (_keyScriptKey == _lastKeyHit)) {
+		runScript(_keyScriptNo, 0, 0, 0);
+		return;
+	}
+
 	if (_game.version >= 6 && _lastKeyHit == 20) {
 		char buf[256];
 

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-10-07 11:54:50 UTC (rev 24163)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-10-07 12:19:28 UTC (rev 24164)
@@ -1625,7 +1625,7 @@
 	if (_game.version <= 3)
 		CHARSET_1();
 
-	processKbd(false);
+	processInput(false);
 	
 	scummLoop_updateScummVars();
 

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2006-10-07 11:54:50 UTC (rev 24163)
+++ scummvm/trunk/engines/scumm/scumm.h	2006-10-07 12:19:28 UTC (rev 24164)
@@ -497,7 +497,7 @@
 	void parseEvents();	// Used by IMuseDigital::startSound
 protected:
 	void waitForTimer(int msec_delay);
-	virtual void processKbd(bool smushMode);
+	virtual void processInput(bool smushMode);
 	virtual void clearClickedStatus();
 
 	// Cursor/palette

Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp	2006-10-07 11:54:50 UTC (rev 24163)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp	2006-10-07 12:19:28 UTC (rev 24164)
@@ -1320,7 +1320,7 @@
 			_warpNeeded = false;
 		}
 		_vm->parseEvents();
-		_vm->processKbd(true);
+		_vm->processInput(true);
 		if (_palDirtyMax >= _palDirtyMin) {
 			byte palette_colors[1024];
 			byte *p = palette_colors;


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