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

svn-id: r24164

5 files changed, 17 insertions, 17 deletions

diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 75fecbc021..5c8009007a 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -467,7 +467,7 @@ protected:
 	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);
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 6516262c8b..92be3070b5 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -202,11 +202,11 @@ void ScummEngine_v90he::clearClickedStatus() {
 	}
 }
 
-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 @@ void ScummEngine::clearClickedStatus() {
 	_rightBtnPressed &= ~msClicked;
 }
 
-void ScummEngine::processKbd(bool smushMode) {
+void ScummEngine::processInput(bool smushMode) {
 	int saveloadkey;
 
 	_lastKeyHit = _keyPressed;
@@ -300,16 +300,6 @@ void ScummEngine::processKbd(bool smushMode) {
 	_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 @@ void ScummEngine::processKbd(bool smushMode) {
 	}
 #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];
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 04a2318a65..931ef7aa52 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1625,7 +1625,7 @@ int ScummEngine::scummLoop(int delta) {
 	if (_game.version <= 3)
 		CHARSET_1();
 
-	processKbd(false);
+	processInput(false);
 	
 	scummLoop_updateScummVars();
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index f630ad52af..f9d5b693e0 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -497,7 +497,7 @@ public:
 	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
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index d2368de89f..94409d5d09 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1320,7 +1320,7 @@ void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) {
 			_warpNeeded = false;
 		}
 		_vm->parseEvents();
-		_vm->processKbd(true);
+		_vm->processInput(true);
 		if (_palDirtyMax >= _palDirtyMin) {
 			byte palette_colors[1024];
 			byte *p = palette_colors;