diff options
| author | Max Horn | 2003-01-01 02:56:22 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-01 02:56:22 +0000 |
| commit | 805c460543927f3b6bc4130a2d41156d5df9e0d0 (patch) | |
| tree | 1b4b4f83146eb9386dcaafb5d918790b67e3b9fd /scumm/scummvm.cpp | |
| parent | cdeaf667949fc6d6e243611c8f4c67a326145194 (diff) | |
| download | scummvm-rg350-805c460543927f3b6bc4130a2d41156d5df9e0d0.tar.gz scummvm-rg350-805c460543927f3b6bc4130a2d41156d5df9e0d0.tar.bz2 scummvm-rg350-805c460543927f3b6bc4130a2d41156d5df9e0d0.zip | |
added yet another variable (for mouse-button-hold flags). Now the 'verb widget' shows up, though it is not erased properly
svn-id: r6304
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index ecd17460b9..a5c4e0d825 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1000,8 +1000,8 @@ void Scumm::clearClickedStatus() { checkKeyHit(); _mouseButStat = 0; - _leftBtnPressed = 0; - _rightBtnPressed = 0; + _leftBtnPressed &= ~msClicked; + _rightBtnPressed &= ~msClicked; } int Scumm::checkKeyHit() @@ -1219,10 +1219,15 @@ int Scumm::getKeyInput(int a) _vars[VAR_MOUSE_BUTTONS] = 0; if (_leftBtnPressed & msClicked) _vars[VAR_MOUSE_BUTTONS] += 1; - if (_rightBtnPressed & msClicked) _vars[VAR_MOUSE_BUTTONS] += 2; + _vars[VAR_MOUSE_HOLD] = 0; + if (_leftBtnPressed & msDown) + _vars[VAR_MOUSE_HOLD] += 1; + if (_rightBtnPressed & msDown) + _vars[VAR_MOUSE_HOLD] += 2; + } else if (_features & GF_AFTER_V7) { // _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0; _vars[VAR_LEFTBTN_HOLD] = (_leftBtnPressed & msDown) != 0; |