[Scummvm-cvs-logs] SF.net SVN: scummvm:[55371] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 55371
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55371&view=rev
Author:   fuzzie
Date:     2011-01-21 10:59:49 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
MOHAWK: Fix two CSTime cursor shape/state checks.

(Thanks to [md5]/thebluegr.)

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/cstime_game.cpp
    scummvm/trunk/engines/mohawk/cstime_ui.cpp

Modified: scummvm/trunk/engines/mohawk/cstime_game.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_game.cpp	2011-01-21 10:10:06 UTC (rev 55370)
+++ scummvm/trunk/engines/mohawk/cstime_game.cpp	2011-01-21 10:59:49 UTC (rev 55371)
@@ -556,8 +556,7 @@
 	}
 
 	if (_currHover != (uint)~0) {
-		// FIXME: cursorGetState() returns a bool, so this check below can never be true
-		if (_vm->getInterface()->cursorGetState() != 3) {
+		if (_vm->getInterface()->cursorGetShape() != 3) {
 			_vm->getInterface()->cursorSetShape(1, true);
 			if (_vm->getInterface()->getInventoryDisplay()->getState() != 4)
 				unhighlightLine(_currHover);

Modified: scummvm/trunk/engines/mohawk/cstime_ui.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_ui.cpp	2011-01-21 10:10:06 UTC (rev 55370)
+++ scummvm/trunk/engines/mohawk/cstime_ui.cpp	2011-01-21 10:59:49 UTC (rev 55371)
@@ -471,7 +471,7 @@
 }
 
 void CSTimeInterface::cursorOverHotspot() {
-	if (cursorGetState() != 1)
+	if (!cursorGetState())
 		return;
 	if (_state == kCSTimeInterfaceStateDragStart || _state == kCSTimeInterfaceStateDragging)
 		return;


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