From 09f7df09e6d4a2b6a8396a41c6ce79a9736f2dd1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 22 Nov 2009 15:22:23 +0000
Subject: Added a sanity check to the setCursor detection

svn-id: r46087
---
 engines/sci/engine/state.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 9db49bcb56..9a63b4e228 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -465,8 +465,10 @@ bool EngineState::autoDetectFeature(FeatureDetection featureDetection, int metho
 	} while (offset > 0);
 
 	// Some games, like KQ5CD, never actually call SetCursor inside Game::setCursor
-	// but call isObject
-	if (featureDetection == kDetectSetCursorType && foundTarget) {
+	// but call isObject. Cover this case here, if we're actually reading the selector
+	// itself, and not iterating through the Game object (i.e. when the selector
+	// dictionary is missing)
+	if (featureDetection == kDetectSetCursorType && methodNum == -1 && foundTarget) {
 		_setCursorType = SCI_VERSION_1_1;
 		return true;
 	}
-- 
cgit v1.2.3