[Scummvm-cvs-logs] CVS: scummvm/sky text.cpp,1.9,1.10
Joost Peters
joostp at users.sourceforge.net
Sun Apr 20 14:51:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7769/sky
Modified Files:
text.cpp
Log Message:
changed casts to make more sense
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- text.cpp 20 Apr 2003 16:22:34 -0000 1.9
+++ text.cpp 20 Apr 2003 21:50:48 -0000 1.10
@@ -198,7 +198,7 @@
}
lineWidth += *(_characterSet+textChar); //add character width
- lineWidth += (int)_dtCharSpacing; //include character spacing
+ lineWidth += (uint16)_dtCharSpacing; //include character spacing
if (pixelWidth <= lineWidth) {
@@ -238,8 +238,8 @@
//make the header
((struct dataFileHeader *)curDest)->s_width = TO_LE_16(_dtLineWidth);
- ((struct dataFileHeader *)curDest)->s_height = TO_LE_16((int)(_charHeight * _dtLines));
- ((struct dataFileHeader *)curDest)->s_sp_size = TO_LE_16((int)(_dtLineWidth * _charHeight * _dtLines));
+ ((struct dataFileHeader *)curDest)->s_height = TO_LE_16((uint16)(_charHeight * _dtLines));
+ ((struct dataFileHeader *)curDest)->s_sp_size = TO_LE_16((uint16)(_dtLineWidth * _charHeight * _dtLines));
((struct dataFileHeader *)curDest)->s_offset_x = TO_LE_16(0);
((struct dataFileHeader *)curDest)->s_offset_y = TO_LE_16(0);
@@ -278,7 +278,7 @@
void SkyText::makeGameCharacter(char textChar, uint8 *charSet, uint8 *&dest, uint8 color) {
bool maskBit, dataBit;
- uint8 charWidth = (int)((*(charSet + textChar)) + 1 - _dtCharSpacing);
+ uint8 charWidth = (uint8)((*(charSet + textChar)) + 1 - _dtCharSpacing);
uint16 data, mask;
byte *charSpritePtr = (charSet + CHAR_SET_HEADER + ((_charHeight << 2) * textChar));
byte *startPos = dest;
More information about the Scummvm-git-logs
mailing list