diff options
author | Filippos Karapetis | 2010-06-25 09:57:37 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-06-25 09:57:37 +0000 |
commit | 550209d1e6468a575fa980144389eda64eddb730 (patch) | |
tree | 80adf0e814162fde25c570c95dbb5dd082590ae4 /engines/sci/engine/kgraphics.cpp | |
parent | dfd8ecc55c143963612467e599f57b96cfc5b62f (diff) | |
download | scummvm-rg350-550209d1e6468a575fa980144389eda64eddb730.tar.gz scummvm-rg350-550209d1e6468a575fa980144389eda64eddb730.tar.bz2 scummvm-rg350-550209d1e6468a575fa980144389eda64eddb730.zip |
Removed the game ID check for embedded priority in icon controls, and replaced it with a check for priority existence
svn-id: r50260
Diffstat (limited to 'engines/sci/engine/kgraphics.cpp')
-rw-r--r-- | engines/sci/engine/kgraphics.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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; |