[Scummvm-cvs-logs] SF.net SVN: scummvm:[46087] scummvm/trunk/engines/sci/engine/state.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Nov 22 16:22:24 CET 2009


Revision: 46087
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46087&view=rev
Author:   thebluegr
Date:     2009-11-22 15:22:23 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
Added a sanity check to the setCursor detection

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/state.cpp

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-11-22 15:06:32 UTC (rev 46086)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-11-22 15:22:23 UTC (rev 46087)
@@ -465,8 +465,10 @@
 	} 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;
 	}


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




More information about the Scummvm-git-logs mailing list