mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21789) -Fix [FS#4405]: When the font misses the fallback character '?', use the sprite font's '?' instead.

release/1.1
frosch 2011-01-14 16:39:41 +00:00
parent 93ae848b0a
commit fad00367ae
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fontcache.cpp
View File

@ -1007,10 +1007,22 @@ const Sprite *GetGlyph(FontSize size, WChar key)
FT_UInt glyph_index = FT_Get_Char_Index(face, key); FT_UInt glyph_index = FT_Get_Char_Index(face, key);
if (glyph_index == 0) { if (glyph_index == 0) {
GetGlyph(size, '?'); if (key == '?') {
glyph = GetGlyphPtr(size, '?'); /* The font misses the '?' character. Use sprite font. */
SetGlyphPtr(size, key, glyph, true); SpriteID sprite = GetUnicodeGlyph(size, key);
return glyph->sprite; Sprite *spr = (Sprite*)GetRawSprite(sprite, ST_FONT, AllocateFont);
assert(spr != NULL);
new_glyph.sprite = spr;
new_glyph.width = spr->width + (size != FS_NORMAL);
SetGlyphPtr(size, key, &new_glyph, false);
return new_glyph.sprite;
} else {
/* Use '?' for missing characters. */
GetGlyph(size, '?');
glyph = GetGlyphPtr(size, '?');
SetGlyphPtr(size, key, glyph, true);
return glyph->sprite;
}
} }
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
FT_Render_Glyph(face->glyph, aa ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO); FT_Render_Glyph(face->glyph, aa ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);