(svn r23243) -Codechange: give a clearer error when the sprite font failed to provide a sprite or fall back to the freetype font if that's loaded

1 files changed, 9 insertions, 1 deletions

diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 820287caf..fdc662659 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -1001,7 +1001,15 @@ const Sprite *GetGlyph(FontSize size, WChar key)
 	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, ST_FONT);
+
+		/* Load the sprite if it's known. */
+		if (sprite != 0) return GetSprite(sprite, ST_FONT);
+
+		/* For the 'rare' case there is no font available at all. */
+		if (face == NULL) error("No sprite font and no real font either... bailing!");
+
+		/* Use the '?' from the freetype font. */
+		key = '?';
 	}
 
 	/* Check for the glyph in our cache */