|
|
@ -468,7 +468,7 @@ void plFont::IRenderString( plMipmap *mip, UInt16 x, UInt16 y, const wchar_t *st |
|
|
|
// handle invalid chars discretely
|
|
|
|
// handle invalid chars discretely
|
|
|
|
plCharacter* charToDraw = &(fCharacters[(UInt16)L' ' - fFirstChar]); |
|
|
|
plCharacter* charToDraw = &(fCharacters[(UInt16)L' ' - fFirstChar]); |
|
|
|
if (fCharacters.Count() <= ((UInt16)string[i] - fFirstChar)) { |
|
|
|
if (fCharacters.Count() <= ((UInt16)string[i] - fFirstChar)) { |
|
|
|
UInt16 w = wctob(string[0]); |
|
|
|
UInt16 w = wctob(string[i]); |
|
|
|
if (w != EOF && (w - fFirstChar) <= fCharacters.Count()) |
|
|
|
if (w != EOF && (w - fFirstChar) <= fCharacters.Count()) |
|
|
|
charToDraw = &(fCharacters[w - fFirstChar]); |
|
|
|
charToDraw = &(fCharacters[w - fFirstChar]); |
|
|
|
} else { |
|
|
|
} else { |
|
|
@ -602,7 +602,7 @@ void plFont::IRenderString( plMipmap *mip, UInt16 x, UInt16 y, const wchar_t *st |
|
|
|
else if( ( fRenderInfo.fFlags & kRenderJustXMask ) == kRenderJustXForceLeft ) |
|
|
|
else if( ( fRenderInfo.fFlags & kRenderJustXMask ) == kRenderJustXForceLeft ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
Int16 baseX = fRenderInfo.fX; |
|
|
|
Int16 baseX = fRenderInfo.fX; |
|
|
|
|
|
|
|
|
|
|
|
plCharacter& ch = fCharacters[(UInt16)L' ' - fFirstChar]; |
|
|
|
plCharacter& ch = fCharacters[(UInt16)L' ' - fFirstChar]; |
|
|
|
if (fCharacters.Count() <= ((UInt16)string[0] - fFirstChar)) { |
|
|
|
if (fCharacters.Count() <= ((UInt16)string[0] - fFirstChar)) { |
|
|
|
UInt16 w = wctob(string[0]); |
|
|
|
UInt16 w = wctob(string[0]); |
|
|
|