diff options
| author | Martin Kiewitz | 2010-01-07 15:25:03 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-07 15:25:03 +0000 |
| commit | 7f358e3bbdb8dbfbdd40f18af54d4fc4a3e8d21b (patch) | |
| tree | c0a7352dc1f18c247fc5cdd0171afa1f4dd1b675 /engines/sci/graphics | |
| parent | 32ec5746bebcfbaecece143f2ee75644a1000d17 (diff) | |
| download | scummvm-rg350-7f358e3bbdb8dbfbdd40f18af54d4fc4a3e8d21b.tar.gz scummvm-rg350-7f358e3bbdb8dbfbdd40f18af54d4fc4a3e8d21b.tar.bz2 scummvm-rg350-7f358e3bbdb8dbfbdd40f18af54d4fc4a3e8d21b.zip | |
SCI: changed kernel signature for kDrawCel, enabled upscaled hires savebox code ("crashed" before because afterwards kDrawCel will get the handle from the savebox call)
svn-id: r47121
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 6e65c0e91f..f2e54d5e6b 100644 --- a/engines/sci/graphics/gui.cpp +++ b/engines/sci/graphics/gui.cpp @@ -367,8 +367,8 @@ void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool animat _gfx->SetPort(oldPort); } -void SciGui::drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, int16 origHeight) { - if (origHeight == -1) +void SciGui::drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool upscaledHires) { + if (!upscaledHires) _gfx->drawCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo); else _gfx->drawHiresCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo); diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h index 6ca800efc2..0d9b481934 100644 --- a/engines/sci/graphics/gui.h +++ b/engines/sci/graphics/gui.h @@ -88,7 +88,7 @@ public: virtual reg_t menuSelect(reg_t eventObject); virtual void drawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo); - virtual void drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, int16 origHeight = -1); + virtual void drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool upscaledHires = false); 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); |