From 550209d1e6468a575fa980144389eda64eddb730 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 25 Jun 2010 09:57:37 +0000
Subject: Removed the game ID check for embedded priority in icon controls, and
 replaced it with a check for priority existence

svn-id: r50260
---
 engines/sci/engine/kgraphics.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 83637c61d0..756ac6ffcb 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -853,11 +853,8 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) {
 			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;
-- 
cgit v1.2.3