diff options
| author | Max Horn | 2011-04-14 14:34:28 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-14 14:34:28 +0200 |
| commit | 2e095e25f2435f0d066d2826176e394bda5c4a9c (patch) | |
| tree | 81d2c4d9e26e4a7644087a13c61b785ae3e431c8 /engines/sky | |
| parent | 84184aabc00251374a181fe296487619afa779ed (diff) | |
| download | scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.tar.gz scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.tar.bz2 scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.zip | |
ALL: centre -> center
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/text.cpp | 12 | ||||
| -rw-r--r-- | engines/sky/text.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 7abece594a..548c9cb3c2 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -231,13 +231,13 @@ char Text::getTextChar(uint8 **data, uint32 *bitPos) { } } -DisplayedText Text::displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) { +DisplayedText Text::displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color) { //Render text into buffer *dest getText(textNum); - return displayText(_textBuffer, dest, centre, pixelWidth, color); + return displayText(_textBuffer, dest, center, pixelWidth, color); } -DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) { +DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool center, uint16 pixelWidth, uint8 color) { //Render text pointed to by *textPtr in buffer *dest uint32 centerTable[10]; uint16 lineWidth = 0; @@ -319,7 +319,7 @@ DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16 uint32 *centerTblPtr = centerTable; do { - if (centre) { + if (center) { uint32 width = (pixelWidth - *centerTblPtr) >> 1; centerTblPtr++; curDest += width; @@ -379,9 +379,9 @@ void Text::makeGameCharacter(uint8 textChar, uint8 *charSetPtr, uint8 *&dest, ui dest = startPos + charWidth + _dtCharSpacing * 2 - 1; } -DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre) { +DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center) { getText(textNum); - DisplayedText textInfo = displayText(_textBuffer, NULL, centre, width, color); + DisplayedText textInfo = displayText(_textBuffer, NULL, center, width, color); uint32 compactNum = FIRST_TEXT_COMPACT; Compact *cpt = _skyCompact->fetchCpt(compactNum); diff --git a/engines/sky/text.h b/engines/sky/text.h index c48d92d24b..06aabf5094 100644 --- a/engines/sky/text.h +++ b/engines/sky/text.h @@ -52,9 +52,9 @@ class Text { public: Text(Disk *skyDisk, SkyCompact *skyCompact); ~Text(); - struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color); - struct DisplayedText displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color); - struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre); + struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color); + struct DisplayedText displayText(char *textPtr, uint8 *dest, bool center, uint16 pixelWidth, uint8 color); + struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center); void fnSetFont(uint32 fontNr); void fnTextModule(uint32 textInfoId, uint32 textNo); void fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY); |