diff options
| author | Joost Peters | 2003-04-21 15:26:13 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-04-21 15:26:13 +0000 |
| commit | 72b3638138a43387cf29500ad1a9a7c74f148034 (patch) | |
| tree | 56562be4c3e265171b9a4784132fcbeec89b5dfb | |
| parent | d836216a71bdd00e15f2f5788d1b8a9502c3f8fb (diff) | |
| download | scummvm-rg350-72b3638138a43387cf29500ad1a9a7c74f148034.tar.gz scummvm-rg350-72b3638138a43387cf29500ad1a9a7c74f148034.tar.bz2 scummvm-rg350-72b3638138a43387cf29500ad1a9a7c74f148034.zip | |
fixed compiler warning
svn-id: r7066
| -rw-r--r-- | sky/text.cpp | 6 | ||||
| -rw-r--r-- | sky/text.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sky/text.cpp b/sky/text.cpp index 2f676923bf..cdc6a10a00 100644 --- a/sky/text.cpp +++ b/sky/text.cpp @@ -275,12 +275,12 @@ void SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelW } -void SkyText::makeGameCharacter(char textChar, uint8 *charSet, uint8 *&dest, uint8 color) { +void SkyText::makeGameCharacter(char textChar, uint8 *charSetPtr, uint8 *&dest, uint8 color) { bool maskBit, dataBit; - uint8 charWidth = (uint8)((*(charSet + textChar)) + 1 - _dtCharSpacing); + uint8 charWidth = (uint8)((*(charSetPtr + textChar)) + 1 - _dtCharSpacing); uint16 data, mask; - byte *charSpritePtr = (charSet + CHAR_SET_HEADER + ((_charHeight << 2) * textChar)); + byte *charSpritePtr = charSetPtr + (CHAR_SET_HEADER + ((_charHeight << 2) * textChar)); byte *startPos = dest; byte *curPos = startPos; diff --git a/sky/text.h b/sky/text.h index 4be27c4237..4d4860feb3 100644 --- a/sky/text.h +++ b/sky/text.h @@ -30,7 +30,7 @@ public: void getText(uint32 textNr, void **itemList, uint16 language); void displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color); void displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color); - void makeGameCharacter(char textChar, uint8 *charSet, uint8 *&data, uint8 color); + void makeGameCharacter(char textChar, uint8 *charSetPtr, uint8 *&data, uint8 color); protected: bool getTBit(); |