[Scummvm-cvs-logs] scummvm master -> a924d4beefc9d82ebe4c5a1880015aa7c97503de

dreammaster dreammaster at scummvm.org
Sat Mar 14 17:47:54 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a924d4beef MADS: Fix hotspot highlighting when easy mouse is off


Commit: a924d4beefc9d82ebe4c5a1880015aa7c97503de
    https://github.com/scummvm/scummvm/commit/a924d4beefc9d82ebe4c5a1880015aa7c97503de
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-14T12:46:46-04:00

Commit Message:
MADS: Fix hotspot highlighting when easy mouse is off

Changed paths:
    engines/mads/events.cpp
    engines/mads/events.h
    engines/mads/screen.cpp
    engines/mads/user_interface.cpp



diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index 06c6055f..767f998 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 21ef374..1a92754 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 c06ff2b..3e2fe22 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 0363ae5..eced2fd 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






More information about the Scummvm-git-logs mailing list