From ca9f08c6244a51098669993ccd829afefe33ff72 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Tue, 6 Oct 2009 16:36:28 +0000 Subject: SCI/newgui: kHiLite support svn-id: r44701 --- engines/sci/gui32/gui32.cpp | 12 ++++++------ engines/sci/gui32/gui32.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/sci/gui32') diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp index 1a05c9a20f..9e91f2b0c5 100644 --- a/engines/sci/gui32/gui32.cpp +++ b/engines/sci/gui32/gui32.cpp @@ -583,27 +583,27 @@ void SciGui32::drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo FULL_REDRAW(); } -void SciGui32::drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool inverse) { +void SciGui32::drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite) { rect_t area = gfx_rect(rect.left, rect.top, rect.width(), rect.height()); ADD_TO_CURRENT_PICTURE_PORT(sciw_new_button_control(s->port, obj, area, text, fontId, - (int8)(style & kControlStateFramed), (int8)inverse, (int8)(style & kControlStateDisabled))); + (int8)(style & kControlStateFramed), (int8)hilite, (int8)(style & kControlStateDisabled))); if (!s->pic_not_valid) FULL_REDRAW(); } -void SciGui32::drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool inverse) { +void SciGui32::drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool hilite) { rect_t area = gfx_rect(rect.left, rect.top, rect.width(), rect.height()); ADD_TO_CURRENT_PICTURE_PORT(sciw_new_text_control(s->port, obj, area, text, fontId, (gfx_alignment_t) mode, - (int8)(!!(style & kControlStateDitherFramed)), (int8)inverse)); + (int8)(!!(style & kControlStateDitherFramed)), (int8)hilite)); if (!s->pic_not_valid) FULL_REDRAW(); } -void SciGui32::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo cellNo, int16 style, bool inverse) { +void SciGui32::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo cellNo, int16 style, bool hilite) { rect_t area = gfx_rect(rect.left, rect.top, rect.width(), rect.height()); ADD_TO_CURRENT_PICTURE_PORT(sciw_new_icon_control(s->port, obj, area, viewId, loopNo, cellNo, - (int8)(style & kControlStateFramed), (int8)inverse)); + (int8)(style & kControlStateFramed), (int8)hilite)); if (!s->pic_not_valid) FULL_REDRAW(); } diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h index 9861d3bcc5..38a3feb221 100644 --- a/engines/sci/gui32/gui32.h +++ b/engines/sci/gui32/gui32.h @@ -59,9 +59,9 @@ public: void drawStatus(const char *text, int16 colorPen, int16 colorBack); void drawPicture(GuiResourceId pictureId, uint16 showStyle, uint16 flags, int16 EGApaletteNo); void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo); - void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool inverse); - void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool inverse); - void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo, int16 style, bool inverse); + void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite); + void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, bool hilite); + void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo, int16 style, bool hilite); void graphFillBoxForeground(Common::Rect rect); void graphFillBoxBackground(Common::Rect rect); -- cgit v1.2.3