diff options
| author | Max Horn | 2005-04-20 23:33:35 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-20 23:33:35 +0000 |
| commit | 7963bb4cb92345948b8f737df8414929f93db527 (patch) | |
| tree | d89bb97667bb09fb515e3c59a15ecbd37e04f77e /scumm/input.cpp | |
| parent | c04ad861fe751503c978cd47258baaa57c22b96d (diff) | |
| download | scummvm-rg350-7963bb4cb92345948b8f737df8414929f93db527.tar.gz scummvm-rg350-7963bb4cb92345948b8f737df8414929f93db527.tar.bz2 scummvm-rg350-7963bb4cb92345948b8f737df8414929f93db527.zip | |
Renamed _mouseButStat -> _mouseAndKeyboardStat (that's what it really is); moved _audioNames to class IMuseDigital
svn-id: r17723
Diffstat (limited to 'scumm/input.cpp')
| -rw-r--r-- | scumm/input.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scumm/input.cpp b/scumm/input.cpp index b9ac0abb92..dd2f29cafe 100644 --- a/scumm/input.cpp +++ b/scumm/input.cpp @@ -210,7 +210,7 @@ void ScummEngine::parseEvents() { void ScummEngine::clearClickedStatus() { _keyPressed = 0; - _mouseButStat = 0; + _mouseAndKeyboardStat = 0; _leftBtnPressed &= ~msClicked; _rightBtnPressed &= ~msClicked; } @@ -251,15 +251,15 @@ void ScummEngine::processKbd(bool smushMode) { // // Determine the mouse button state. // - _mouseButStat = 0; + _mouseAndKeyboardStat = 0; // Interpret 'return' as left click and 'tab' as right click if (_lastKeyHit && _cursor.state > 0) { if (_lastKeyHit == 9) { - _mouseButStat = MBS_RIGHT_CLICK; + _mouseAndKeyboardStat = MBS_RIGHT_CLICK; _lastKeyHit = 0; } else if (_lastKeyHit == 13) { - _mouseButStat = MBS_LEFT_CLICK; + _mouseAndKeyboardStat = MBS_LEFT_CLICK; _lastKeyHit = 0; } } @@ -269,19 +269,19 @@ void ScummEngine::processKbd(bool smushMode) { // the cutscene exit key (i.e. ESC in most games). That mimicks // the behaviour of the original engine where pressing both // mouse buttons also skips the current cutscene. - _mouseButStat = 0; + _mouseAndKeyboardStat = 0; _lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY); } else if (_rightBtnPressed & msClicked && (_version < 4 && _gameId != GID_LOOM)) { // Pressing right mouse button is treated as if you pressed // the cutscene exit key (i.e. ESC in most games). That mimicks // the behaviour of the original engine where pressing right // mouse button also skips the current cutscene. - _mouseButStat = 0; + _mouseAndKeyboardStat = 0; _lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY); } else if (_leftBtnPressed & msClicked) { - _mouseButStat = MBS_LEFT_CLICK; + _mouseAndKeyboardStat = MBS_LEFT_CLICK; } else if (_rightBtnPressed & msClicked) { - _mouseButStat = MBS_RIGHT_CLICK; + _mouseAndKeyboardStat = MBS_RIGHT_CLICK; } if (_version == 8) { @@ -478,7 +478,7 @@ void ScummEngine::processKbd(bool smushMode) { } } - _mouseButStat = _lastKeyHit; + _mouseAndKeyboardStat = _lastKeyHit; } } // End of namespace Scumm |