diff options
| author | D G Turner | 2015-12-18 08:57:32 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:09 +0100 |
| commit | a7afc80e185c6a54bc056e0312ae5882a6ebc5ad (patch) | |
| tree | 4e1711e116a07923aaba3ddd95413e0fbc5f6815 | |
| parent | 28bfce3de7e9b0ee043b4da88975f71cd72c347b (diff) | |
| download | scummvm-rg350-a7afc80e185c6a54bc056e0312ae5882a6ebc5ad.tar.gz scummvm-rg350-a7afc80e185c6a54bc056e0312ae5882a6ebc5ad.tar.bz2 scummvm-rg350-a7afc80e185c6a54bc056e0312ae5882a6ebc5ad.zip | |
LAB: Avoid variable shadowing compiler warning.
| -rw-r--r-- | engines/lab/dispman.cpp | 6 | ||||
| -rw-r--r-- | engines/lab/dispman.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index 3702e70b74..8d26cef4ab 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -227,7 +227,7 @@ int DisplayMan::flowText( x += (width - textLength(msgFont, lineBuffer, strlen(lineBuffer))) / 2; if (output) - text(msgFont, x, y, penColor, lineBuffer, strlen(lineBuffer)); + drawText(msgFont, x, y, penColor, lineBuffer, strlen(lineBuffer)); numLines--; y += fontHeight; @@ -325,7 +325,7 @@ void DisplayMan::drawMessage(const char *str) { _vm->_event->mouseHide(); createBox(168); - text(_vm->_msgFont, _vm->_utils->vgaScaleX(7), _vm->_utils->vgaScaleY(155) + _vm->_utils->svgaCord(2), 1, str, strlen(str)); + drawText(_vm->_msgFont, _vm->_utils->vgaScaleX(7), _vm->_utils->vgaScaleY(155) + _vm->_utils->svgaCord(2), 1, str, strlen(str)); _vm->_event->mouseShow(); _lastMessageLong = false; } @@ -668,7 +668,7 @@ uint16 DisplayMan::textHeight(TextFont *tf) { /** * Draws the text to the screen. */ -void DisplayMan::text(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numChars) { +void DisplayMan::drawText(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numChars) { byte *vgaTop = getCurrentDrawingBuffer(); for (uint16 i = 0; i < numChars; i++) { diff --git a/engines/lab/dispman.h b/engines/lab/dispman.h index ca686ded8e..8561982e97 100644 --- a/engines/lab/dispman.h +++ b/engines/lab/dispman.h @@ -133,7 +133,7 @@ public: void closeFont(TextFont *font); uint16 textLength(TextFont *font, const char *text, uint16 numChars); uint16 textHeight(TextFont *tf); - void text(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numChars); + void drawText(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numChars); void getLine(TextFont *tf, char *lineBuffer, const char **mainBuffer, uint16 lineWidth); bool _longWinInFront; |