[Scummvm-cvs-logs] SF.net SVN: scummvm:[53540] scummvm/trunk/engines/toon/toon.cpp

[sylvaintv at users.sourceforge.net]

Revision: 53540
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53540&view=rev
Author:   sylvaintv
Date:     2010-10-16 15:44:50 +0000 (Sat, 16 Oct 2010)

Log Message:
-----------
TOON: Fixed bug #3085999 with bad mouse button behavior

Bug #3085999: TOON: "Exiting inventory screen loop"
Now the events are fired on mouse down instead of on mouse up.

Modified Paths:
--------------
    scummvm/trunk/engines/toon/toon.cpp

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2010-10-16 15:14:09 UTC (rev 53539)
+++ scummvm/trunk/engines/toon/toon.cpp	2010-10-16 15:44:50 UTC (rev 53540)
@@ -1223,9 +1223,9 @@
 	bool leftButton = false;
 	bool rightButton = false;
 
-	if ((_lastMouseButton & 0x1) == 1 && (_mouseButton & 0x1) == 0)
+	if ((_lastMouseButton & 0x1) == 0 && (_mouseButton & 0x1) == 1)
 		leftButton = true;
-	if ((_lastMouseButton & 0x2) == 2 && (_mouseButton & 0x2) == 0)
+	if ((_lastMouseButton & 0x2) == 0 && (_mouseButton & 0x2) == 2)
 		rightButton = true;
 
 	_lastMouseButton = _mouseButton;
@@ -2475,7 +2475,9 @@
 	}
 
 	_gameState->_currentScrollValue = oldScrollValue;
-	_gameState->_inInventory = false;
+	_gameState->_inInventory = false; 
+	_mouseButton = 0;
+	_lastMouseButton = 0x3;
 
 	fadeOut(5);
 	if (_gameState->_inCloseUp) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.