diff options
| author | Martin Kiewitz | 2010-01-22 19:25:48 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-22 19:25:48 +0000 |
| commit | 4500910b4929f36f89a96827fa7f77677a217c8c (patch) | |
| tree | a5d192287fcea7a22b4021411a6b1966ac43dc6a /engines/sci/graphics | |
| parent | 48184679086094cc5d6067de8c31a6823fc71732 (diff) | |
| download | scummvm-rg350-4500910b4929f36f89a96827fa7f77677a217c8c.tar.gz scummvm-rg350-4500910b4929f36f89a96827fa7f77677a217c8c.tar.bz2 scummvm-rg350-4500910b4929f36f89a96827fa7f77677a217c8c.zip | |
SCI: reverting r47412, change was incorrect and also resulted in broken animations inside text boxes in kq5. jones also uses hardcoded -1 priority for control icons.
svn-id: r47444
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/gui.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/gui.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp index 04b8a75fc0..ae73419f6c 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 priority, int16 style, bool hilite) { +void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 style, bool hilite) { if (!hilite) { - _gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, priority, 0); + _gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, 255, 0); if (style & 0x20) { _gfx->FrameRect(rect); } diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h index b61b0d5268..cf35865c5d 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 priority, int16 style, bool hilite); + virtual void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, 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); |