diff options
author | Martin Kiewitz | 2010-01-22 22:34:14 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-01-22 22:34:14 +0000 |
commit | fa80444a12cf5b0d1c4bbda81c4d7e969d905fee (patch) | |
tree | 255d3aeb81e99bb841d5c485ed7a3d61cc2ce382 /engines/sci | |
parent | 4500910b4929f36f89a96827fa7f77677a217c8c (diff) | |
download | scummvm-rg350-fa80444a12cf5b0d1c4bbda81c4d7e969d905fee.tar.gz scummvm-rg350-fa80444a12cf5b0d1c4bbda81c4d7e969d905fee.tar.bz2 scummvm-rg350-fa80444a12cf5b0d1c4bbda81c4d7e969d905fee.zip |
SCI: restoring r47412, we were right all along but this "hack" was done on the sierra sci interpreter for jones ega/vga only (talkie NOT included). So this restore does it game specific now, causing no regressions anywhere else. We detect jones/talkie as "jones" as well, may cause regressions for talkie
svn-id: r47445
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/engine/kgraphics.cpp | 11 | ||||
-rw-r--r-- | engines/sci/graphics/gui.cpp | 4 | ||||
-rw-r--r-- | engines/sci/graphics/gui.h | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 47415e7565..0752a9fc33 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -707,6 +707,7 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) { GuiResourceId viewId; int16 loopNo; int16 celNo; + int16 priority; reg_t listSeeker; Common::String *listStrings = NULL; const char **listEntries = NULL; @@ -744,9 +745,17 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) { loopNo = (l & 0x80) ? l - 256 : l; int c = GET_SEL32V(s->_segMan, controlObject, 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 (s->_gameId == "jones") + priority = GET_SEL32V(s->_segMan, controlObject, priority); + else + priority = -1; } debugC(2, kDebugLevelGraphics, "drawing icon control %04x:%04x to %d,%d\n", PRINT_REG(controlObject), x, y - 1); - s->_gui->drawControlIcon(rect, controlObject, viewId, loopNo, celNo, style, hilite); + s->_gui->drawControlIcon(rect, controlObject, viewId, loopNo, celNo, priority, style, hilite); return; case SCI_CONTROLS_TYPE_LIST: diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp index ae73419f6c..04b8a75fc0 100644 --- a/engines/sci/graphics/gui.cpp +++ b/engines/sci/graphics/gui.cpp @@ -445,9 +445,9 @@ void SciGui::drawControlTextEdit(Common::Rect rect, reg_t obj, const char *text, _gfx->BitsShow(rect); } -void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 style, bool hilite) { +void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite) { if (!hilite) { - _gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, 255, 0); + _gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, priority, 0); if (style & 0x20) { _gfx->FrameRect(rect); } diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h index cf35865c5d..b61b0d5268 100644 --- a/engines/sci/graphics/gui.h +++ b/engines/sci/graphics/gui.h @@ -92,7 +92,7 @@ public: virtual void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite); virtual void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 alignment, int16 style, bool hilite); virtual void drawControlTextEdit(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite); - virtual void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 style, bool hilite); + virtual void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite); virtual void drawControlList(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const char **entries, GuiResourceId fontId, int16 style, int16 upperPos, int16 cursorPos, bool isAlias, bool hilite); virtual void editControl(reg_t controlObject, reg_t eventObject); |