diff options
| author | Paul Gilbert | 2015-03-14 12:46:46 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-03-14 12:46:46 -0400 |
| commit | a924d4beefc9d82ebe4c5a1880015aa7c97503de (patch) | |
| tree | a6d965fbf0b7d80bd08b84595d181039d87188fe /engines | |
| parent | 561481499d4cb6e1d2a85e5dc35c7c8ff0534e3d (diff) | |
| download | scummvm-rg350-a924d4beefc9d82ebe4c5a1880015aa7c97503de.tar.gz scummvm-rg350-a924d4beefc9d82ebe4c5a1880015aa7c97503de.tar.bz2 scummvm-rg350-a924d4beefc9d82ebe4c5a1880015aa7c97503de.zip | |
MADS: Fix hotspot highlighting when easy mouse is off
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mads/events.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/events.h | 2 | ||||
| -rw-r--r-- | engines/mads/screen.cpp | 6 | ||||
| -rw-r--r-- | engines/mads/user_interface.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp index 06c6055f01..767f998d81 100644 --- a/engines/mads/events.cpp +++ b/engines/mads/events.cpp @@ -41,7 +41,7 @@ EventsManager::EventsManager(MADSEngine *vm) { _mouseReleased = false; _mouseButtons = 0; _mouseStatus = 0; - _vD2 = 0; + _strokeGoing = 0; _mouseStatusCopy = 0; _mouseMoved = false; _rightMousePressed = false; @@ -266,7 +266,7 @@ void EventsManager::waitForNextFrame() { void EventsManager::initVars() { _mousePos = Common::Point(-1, -1); _mouseStatusCopy = _mouseStatus; - _vD2 = 0; + _strokeGoing = 0; } } // End of namespace MADS diff --git a/engines/mads/events.h b/engines/mads/events.h index 21ef37407b..1a92754f10 100644 --- a/engines/mads/events.h +++ b/engines/mads/events.h @@ -67,7 +67,7 @@ public: byte _mouseButtons; bool _rightMousePressed; int _mouseStatus; - int _vD2; + int _strokeGoing; int _mouseStatusCopy; bool _mouseMoved; Common::Stack<Common::KeyState> _pendingKeys; diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index c06ff2b7b7..3e2fe22611 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -308,10 +308,10 @@ void ScreenObjects::check(bool scanFlag) { } //_released = _vm->_events->_mouseReleased; - if (_vm->_events->_vD2 || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy)) + if (_vm->_events->_mouseButtons || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy)) scene._userInterface._category = _category; - if (!_vm->_events->_mouseButtons || _vm->_easyMouse) { + if (_vm->_events->_mouseButtons || _vm->_easyMouse) { if (userInterface._category >= CAT_COMMAND && userInterface._category <= CAT_TALK_ENTRY) { elementHighlighted(); } @@ -526,7 +526,7 @@ void ScreenObjects::elementHighlighted() { action._pickedWord = newIndex; if (_category == CAT_INV_LIST || _category == CAT_INV_ANIM) { - if (action._interAwaiting == 1 && newIndex >= 0 && _released && + if (action._interAwaiting == AWAITING_COMMAND && newIndex >= 0 && _released && (!_vm->_events->_mouseReleased || !_vm->_easyMouse)) newIndex = -1; } diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp index 0363ae5ef9..eced2fdb12 100644 --- a/engines/mads/user_interface.cpp +++ b/engines/mads/user_interface.cpp @@ -522,7 +522,7 @@ void UserInterface::updateInventoryScroller() { uint32 timeInc = _scrollbarQuickly ? 100 : 380; if (_vm->_events->_mouseStatus && (_scrollbarMilliTime + timeInc) <= currentMilli) { - _scrollbarQuickly = _vm->_events->_vD2 < 1; + _scrollbarQuickly = _vm->_events->_strokeGoing < 1; _scrollbarMilliTime = currentMilli; // Change the scrollbar and visible inventory list |