diff options
| author | Max Horn | 2006-10-07 11:54:50 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-07 11:54:50 +0000 |
| commit | ef30cdf78bcb685fea823c6e95b6490ffd66823f (patch) | |
| tree | c121dfa4f24888d4fa171ed1adff9d595b845592 /engines/scumm/input.cpp | |
| parent | 05e7423ed8edc62f6a0268c817711ab74eeee92d (diff) | |
| download | scummvm-rg350-ef30cdf78bcb685fea823c6e95b6490ffd66823f.tar.gz scummvm-rg350-ef30cdf78bcb685fea823c6e95b6490ffd66823f.tar.bz2 scummvm-rg350-ef30cdf78bcb685fea823c6e95b6490ffd66823f.zip | |
some HE related cleanup
svn-id: r24163
Diffstat (limited to 'engines/scumm/input.cpp')
| -rw-r--r-- | engines/scumm/input.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index eb814b2819..6516262c8b 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -194,14 +194,25 @@ void ScummEngine::parseEvents() { } } -void ScummEngine::clearClickedStatus() { - _keyPressed = 0; - #ifndef DISABLE_HE +void ScummEngine_v90he::clearClickedStatus() { + ScummEngine::clearClickedStatus(); if (_game.heversion >= 98) { - ((ScummEngine_v90he *)this)->_logicHE->processKeyStroke(_keyPressed); + _logicHE->processKeyStroke(_keyPressed); } +} + +void ScummEngine_v90he::processKbd(bool smushMode) { + if (_game.heversion >= 98) { + _logicHE->processKeyStroke(_keyPressed); + } + ScummEngine::processKbd(smushMode); +} #endif + +void ScummEngine::clearClickedStatus() { + _keyPressed = 0; + _mouseAndKeyboardStat = 0; _leftBtnPressed &= ~msClicked; _rightBtnPressed &= ~msClicked; @@ -210,12 +221,6 @@ void ScummEngine::clearClickedStatus() { void ScummEngine::processKbd(bool smushMode) { int saveloadkey; -#ifndef DISABLE_HE - if (_game.heversion >= 98) { - ((ScummEngine_v90he *)this)->_logicHE->processKeyStroke(_keyPressed); - } -#endif - _lastKeyHit = _keyPressed; _keyPressed = 0; if (((_game.version <= 2) || (_game.platform == Common::kPlatformFMTowns && _game.version == 3)) && 315 <= _lastKeyHit && _lastKeyHit < 315+12) { |