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

[thebluegr at users.sourceforge.net]

Revision: 50260
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50260&view=rev
Author:   thebluegr
Date:     2010-06-25 09:57:37 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
Removed the game ID check for embedded priority in icon controls, and replaced it with a check for priority existence

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-06-25 05:12:45 UTC (rev 50259)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-06-25 09:57:37 UTC (rev 50260)
@@ -853,11 +853,8 @@
 			loopNo = (l & 0x80) ? l - 256 : l;
 			int c = readSelectorValue(s->_segMan, controlObject, SELECTOR(cel));
 			celNo = (c & 0x80) ? c - 256 : c;
-			// Game-specific: *ONLY* the jones EGA/VGA sierra interpreter contain code using priority selector
-			//  ALL other games use a hardcoded -1 (madness!)
-			// We are detecting jones/talkie as "jones" as well, but the sierra interpreter of talkie doesnt have this
-			//  "hack". Hopefully it wont cause regressions (the code causes regressions if used against kq5/floppy)
-			if (g_sci->getGameId() == "jones")
+			// Check if the control object specifies a priority selector (like in Jones)
+			if (lookupSelector(s->_segMan, controlObject, SELECTOR(priority), NULL, NULL) == kSelectorVariable)
 				priority = readSelectorValue(s->_segMan, controlObject, SELECTOR(priority));
 			else
 				priority = -1;


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