diff options
author | Max Horn | 2006-10-07 12:19:28 +0000 |
---|---|---|
committer | Max Horn | 2006-10-07 12:19:28 +0000 |
commit | f13e4baaf987cb65045c3ffeb01fb9d5e530e1da (patch) | |
tree | 8e8bfada758aa9a6910f3c016d0b275c9f21425a /engines/scumm/input.cpp | |
parent | ef30cdf78bcb685fea823c6e95b6490ffd66823f (diff) | |
download | scummvm-rg350-f13e4baaf987cb65045c3ffeb01fb9d5e530e1da.tar.gz scummvm-rg350-f13e4baaf987cb65045c3ffeb01fb9d5e530e1da.tar.bz2 scummvm-rg350-f13e4baaf987cb65045c3ffeb01fb9d5e530e1da.zip |
Renemaed ScummEngine::processKbd to processInput (as it also deals with the mouse)
svn-id: r24164
Diffstat (limited to 'engines/scumm/input.cpp')
-rw-r--r-- | engines/scumm/input.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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]; |