Mercurial > hg > openttd

diff src/fontcache.cpp @ 10056:7867701f63e4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r14223) -Codechange: make GetSprite aware of the 4 different types of sprites: fonts, recolour, mapgen and normal sprites.
author rubidium <rubidium@openttd.org>
date Tue, 02 Sep 2008 15:20:38 +0000
parents c5aa1a22224f
children d4b8b071d3e2
line wrap: on
line diff
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -401,7 +401,7 @@
 	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 @@
 	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);