aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-11-22 15:22:23 +0000
committerFilippos Karapetis2009-11-22 15:22:23 +0000
commit09f7df09e6d4a2b6a8396a41c6ce79a9736f2dd1 (patch)
tree47447c023c3757c0a38b813263cadee9abbf5d21
parent054dd568a40bc82733cf001e9bdd4e16450f5e83 (diff)
downloadscummvm-rg350-09f7df09e6d4a2b6a8396a41c6ce79a9736f2dd1.tar.gz
scummvm-rg350-09f7df09e6d4a2b6a8396a41c6ce79a9736f2dd1.tar.bz2
scummvm-rg350-09f7df09e6d4a2b6a8396a41c6ce79a9736f2dd1.zip
Added a sanity check to the setCursor detection
svn-id: r46087
-rw-r--r--engines/sci/engine/state.cpp6
1 files changed, 4 insertions, 2 deletions
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;
}