[Scummvm-cvs-logs] CVS: scummvm/sky text.cpp,1.12,1.13 text.h,1.6,1.7

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv13373/sky

Modified Files:
	text.cpp text.h 
Log Message:
fixed compiler warning

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- text.cpp	21 Apr 2003 14:06:45 -0000	1.12
+++ text.cpp	21 Apr 2003 15:26:13 -0000	1.13
@@ -275,12 +275,12 @@
 			
 }
 
-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;
 

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- text.h	21 Apr 2003 14:06:45 -0000	1.6
+++ text.h	21 Apr 2003 15:26:13 -0000	1.7
@@ -30,7 +30,7 @@
 	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();