diff options
| author | Filippos Karapetis | 2010-01-05 14:59:43 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-05 14:59:43 +0000 |
| commit | cc87f4a741a2b9d85b31b6bae3617beb1a7da6e9 (patch) | |
| tree | 9196e2ab648500a16309eb71e1204d39bdfb9d98 | |
| parent | 9606e7fca72645a05ecdce97cc484351e23c7ead (diff) | |
| download | scummvm-rg350-cc87f4a741a2b9d85b31b6bae3617beb1a7da6e9.tar.gz scummvm-rg350-cc87f4a741a2b9d85b31b6bae3617beb1a7da6e9.tar.bz2 scummvm-rg350-cc87f4a741a2b9d85b31b6bae3617beb1a7da6e9.zip | |
Renamed the version of drawCel() which calls BitsShow() to drawCelAndShow(), to avoid confusion
svn-id: r47028
| -rw-r--r-- | engines/sci/graphics/gfx.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/gfx.h | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/gui.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/gfx.cpp b/engines/sci/graphics/gfx.cpp index abb002b000..f8f6146990 100644 --- a/engines/sci/graphics/gfx.cpp +++ b/engines/sci/graphics/gfx.cpp @@ -329,7 +329,7 @@ void Gfx::drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredF } // This one is the only one that updates screen! -void Gfx::drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight, uint16 scaleX, uint16 scaleY) { +void Gfx::drawCelAndShow(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight, uint16 scaleX, uint16 scaleY) { View *view = getView(viewId); Common::Rect rect; diff --git a/engines/sci/graphics/gfx.h b/engines/sci/graphics/gfx.h index 764d8f925d..904b33c679 100644 --- a/engines/sci/graphics/gfx.h +++ b/engines/sci/graphics/gfx.h @@ -84,7 +84,7 @@ public: void BitsFree(MemoryHandle memoryHandle); void drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, GuiResourceId paletteId); - void drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128); + void drawCelAndShow(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128); void drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, Common::Rect celRect, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128); void drawCel(View *view, LoopNo loopNo, CelNo celNo, Common::Rect celRect, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128); diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp index 9643869e16..c07211b8a4 100644 --- a/engines/sci/graphics/gui.cpp +++ b/engines/sci/graphics/gui.cpp @@ -352,7 +352,7 @@ void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool animat } void SciGui::drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, int16 origHeight) { - _gfx->drawCel(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo, origHeight); + _gfx->drawCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo, origHeight); _palette->setOnScreen(); } @@ -424,7 +424,7 @@ void SciGui::drawControlTextEdit(Common::Rect rect, reg_t obj, const char *text, void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, LoopNo loopNo, CelNo celNo, int16 style, bool hilite) { if (!hilite) { - _gfx->drawCel(viewId, loopNo, celNo, rect.left, rect.top, 255, 0); + _gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, 255, 0); if (style & 0x20) { _gfx->FrameRect(rect); } |