From 94ac240761e19c3fa03e57d09cf4755cc6a30210 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Fri, 21 Jan 2011 10:59:49 +0000
Subject: MOHAWK: Fix two CSTime cursor shape/state checks.

(Thanks to [md5]/thebluegr.)

svn-id: r55371
---
 engines/mohawk/cstime_game.cpp | 3 +--
 engines/mohawk/cstime_ui.cpp   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index 867f5c7729..57dffabd80 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -556,8 +556,7 @@ void CSTimeConversation::mouseMove(Common::Point &pos) {
 	}
 
 	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);
diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp
index 08f70ea291..19c3ccc3da 100644
--- a/engines/mohawk/cstime_ui.cpp
+++ b/engines/mohawk/cstime_ui.cpp
@@ -471,7 +471,7 @@ void CSTimeInterface::mouseUp(Common::Point pos) {
 }
 
 void CSTimeInterface::cursorOverHotspot() {
-	if (cursorGetState() != 1)
+	if (!cursorGetState())
 		return;
 	if (_state == kCSTimeInterfaceStateDragStart || _state == kCSTimeInterfaceStateDragging)
 		return;
-- 
cgit v1.2.3