[Scummvm-cvs-logs] SF.net SVN: scummvm:[48419] scummvm/branches/branch-1-1-0/backends/platform /ds/arm9/source/dsmain.cpp

[agent-q at users.sourceforge.net]

Revision: 48419
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48419&view=rev
Author:   agent-q
Date:     2010-03-29 23:15:24 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
DS: Fix hover mode in MADE games.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp	2010-03-29 21:01:19 UTC (rev 48418)
+++ scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp	2010-03-29 23:15:24 UTC (rev 48419)
@@ -1403,18 +1403,21 @@
 	if (getPenReleased() && (leftButtonDown || rightButtonDown)) {
 		if (leftButtonDown) {
 			event.type = Common::EVENT_LBUTTONUP;
-		} else {
+			leftButtonDown = false;
+			event.mouse = Common::Point(getPenX(), getPenY());
+			system->addEvent(event);
+		} else if (rightButtonDown) {
 			event.type = Common::EVENT_RBUTTONUP;
+			rightButtonDown = false;
+			event.mouse = Common::Point(getPenX(), getPenY());
+			system->addEvent(event);
 		}
-
-		event.mouse = Common::Point(getPenX(), getPenY());
-		system->addEvent(event);
 	}
 
 
 	if ((mouseMode != MOUSE_HOVER) || (!displayModeIs8Bit)) {
 		if (getPenDown() && (!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R))) {
-			if ((mouseMode == MOUSE_LEFT) || (!displayModeIs8Bit)) {
+			if (mouseMode == MOUSE_LEFT) {
 				event.type = Common::EVENT_LBUTTONDOWN;
 				leftButtonDown = true;
 			} else {
@@ -1462,8 +1465,7 @@
 				mouseMode = MOUSE_LEFT;
 			}
 
-			if (rightButtonDown)
-			{
+			if (rightButtonDown) {
 				Common::Event event;
 				event.mouse = Common::Point(getPenX(), getPenY());
 				event.type = Common::EVENT_RBUTTONUP;


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