diff options
| author | Paul Gilbert | 2014-04-05 14:27:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-05 14:27:33 -0400 |
| commit | 06aeba275acb80df86ff103880c07ccc0e9738b1 (patch) | |
| tree | 579695e60d84f3527d587a352743f7554b595d3f /engines/mads/screen.cpp | |
| parent | 2a105149fe734f9cec759b08e8a545bcd0b97078 (diff) | |
| download | scummvm-rg350-06aeba275acb80df86ff103880c07ccc0e9738b1.tar.gz scummvm-rg350-06aeba275acb80df86ff103880c07ccc0e9738b1.tar.bz2 scummvm-rg350-06aeba275acb80df86ff103880c07ccc0e9738b1.zip | |
MADS: Fix right mouse button handling
Diffstat (limited to 'engines/mads/screen.cpp')
| -rw-r--r-- | engines/mads/screen.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 44f0907040..f03f89122f 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -286,7 +286,7 @@ void ScreenObjects::check(bool scanFlag) { UserInterface &userInterface = scene._userInterface; if (!_vm->_events->_mouseButtons || _inputMode != kInputBuildingSentences) - _vm->_events->_anyStroke = false; + _vm->_events->_rightMousePressed = false; if ((_vm->_events->_mouseMoved || _vm->_game->_scene._userInterface._scrollerY || _v8332A || _v8333C) && scanFlag) { @@ -473,13 +473,13 @@ void ScreenObjects::elementHighlighted() { indexEnd = 9; varA = 5; topIndex = 0; - idxP = !_vm->_events->_anyStroke ? &userInterface._highlightedCommandIndex : + idxP = !_vm->_events->_rightMousePressed ? &userInterface._highlightedCommandIndex : &userInterface._selectedActionIndex; - if (_vm->_events->_anyStroke && userInterface._selectedItemVocabIdx >= 0) + if (_vm->_events->_rightMousePressed && userInterface._selectedItemVocabIdx >= 0) userInterface.updateSelection(CAT_INV_VOCAB, -1, &userInterface._selectedItemVocabIdx); - var4 = _released && !_vm->_events->_anyStroke ? 1 : 0; + var4 = _released && !_vm->_events->_rightMousePressed ? 1 : 0; break; case CAT_INV_LIST: @@ -505,12 +505,12 @@ void ScreenObjects::elementHighlighted() { varA = 0; topIndex = 0; - idxP = _vm->_events->_anyStroke ? &userInterface._selectedItemVocabIdx : &userInterface._highlightedActionIndex; + idxP = _vm->_events->_rightMousePressed ? &userInterface._selectedItemVocabIdx : &userInterface._highlightedActionIndex; - if (_vm->_events->_anyStroke && userInterface._selectedActionIndex >= 0) + if (_vm->_events->_rightMousePressed && userInterface._selectedActionIndex >= 0) userInterface.updateSelection(CAT_COMMAND, -1, &userInterface._selectedActionIndex); - var4 = _released && !_vm->_events->_anyStroke ? 1 : 0; + var4 = _released && !_vm->_events->_rightMousePressed ? 1 : 0; break; case CAT_INV_ANIM: @@ -605,7 +605,7 @@ void ScreenObjects::elementHighlighted() { newIndex = -1; } - if (_released && !_vm->_events->_anyStroke && + if (_released && !_vm->_events->_rightMousePressed && (_vm->_events->_mouseReleased || !_vm->_easyMouse)) newIndex = -1; |