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

(svn r25822) -Fix [FS#5704]: Searching for a suitable font failed, if one of the fonts had no '?' glyph, and no baseset is installed.

release/1.4
frosch 2013-10-06 20:08:11 +00:00
parent 1e0dd39075
commit b4609fd923
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/fontcache.cpp
View File

@ -458,9 +458,34 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
if (key == 0) { if (key == 0) {
GlyphID question_glyph = this->MapCharToGlyph('?'); GlyphID question_glyph = this->MapCharToGlyph('?');
if (question_glyph == 0) { if (question_glyph == 0) {
/* The font misses the '?' character. Use sprite font. */ /* The font misses the '?' character. Use built-in sprite.
SpriteID sprite = this->GetUnicodeGlyph(key); * Note: We cannot use the baseset as this also has to work in the bootstrap GUI. */
Sprite *spr = (Sprite*)GetRawSprite(sprite, ST_FONT, AllocateFont); #define CPSET { 0, 0, 0, 0, 1 }
#define CP___ { 0, 0, 0, 0, 0 }
static SpriteLoader::CommonPixel builtin_questionmark_data[10 * 8] = {
CP___, CP___, CPSET, CPSET, CPSET, CPSET, CP___, CP___,
CP___, CPSET, CPSET, CP___, CP___, CPSET, CPSET, CP___,
CP___, CP___, CP___, CP___, CP___, CPSET, CPSET, CP___,
CP___, CP___, CP___, CP___, CPSET, CPSET, CP___, CP___,
CP___, CP___, CP___, CPSET, CPSET, CP___, CP___, CP___,
CP___, CP___, CP___, CPSET, CPSET, CP___, CP___, CP___,
CP___, CP___, CP___, CPSET, CPSET, CP___, CP___, CP___,
CP___, CP___, CP___, CP___, CP___, CP___, CP___, CP___,
CP___, CP___, CP___, CPSET, CPSET, CP___, CP___, CP___,
CP___, CP___, CP___, CPSET, CPSET, CP___, CP___, CP___,
};
#undef CPSET
#undef CP___
static const SpriteLoader::Sprite builtin_questionmark = {
10, // height
8, // width
0, // x_offs
0, // y_offs
ST_FONT,
builtin_questionmark_data
};
Sprite *spr = BlitterFactoryBase::GetCurrentBlitter()->Encode(&builtin_questionmark, AllocateFont);
assert(spr != NULL); assert(spr != NULL);
new_glyph.sprite = spr; new_glyph.sprite = spr;
new_glyph.width = spr->width + (this->fs != FS_NORMAL); new_glyph.width = spr->width + (this->fs != FS_NORMAL);