aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sky/text.cpp6
-rw-r--r--sky/text.h2
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();