cpp/openttd-patchpack/source File Diff

File diff r10055:e754c2215cb8 → r10056:7a18efcd8edb

src/fontcache.cpp

➞

Show inline comments

@@ @@ -401,7 +401,7 @@ const Sprite *GetGlyph(FontSize size, WC @@
 	if (face == NULL || (key >= SCC_SPRITE_START && key <= SCC_SPRITE_END)) {
 		SpriteID sprite = GetUnicodeGlyph(size, key);
 		if (sprite == 0) sprite = GetUnicodeGlyph(size, '?');
 		return GetSprite(sprite);
+		return GetSprite(sprite, ST_FONT);
+	}
 	/* Check for the glyph in our cache */
@@ @@ -470,7 +470,7 @@ uint GetGlyphWidth(FontSize size, WChar @@
 	if (face == NULL || (key >= SCC_SPRITE_START && key <= SCC_SPRITE_END)) {
 		SpriteID sprite = GetUnicodeGlyph(size, key);
 		if (sprite == 0) sprite = GetUnicodeGlyph(size, '?');
 		return SpriteExists(sprite) ? GetSprite(sprite)->width + (size != FS_NORMAL) : 0;
+		return SpriteExists(sprite) ? GetSprite(sprite, ST_FONT)->width + (size != FS_NORMAL) : 0;
+	}
 	glyph = GetGlyphPtr(size, key);