summaryrefslogtreecommitdiff
path: root/src/fontcache.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-09-02 15:20:38 +0000
committerrubidium <rubidium@openttd.org>2008-09-02 15:20:38 +0000
commitc8e8911ef676f503ac5789d3fefac1278cdef971 (patch)
treee7050537d14303dbc6bc9a461ff38931861cc4aa /src/fontcache.cpp
parentcbe397388f0ef537b61095b05ee4edfe9dd92202 (diff)
downloadopenttd-c8e8911ef676f503ac5789d3fefac1278cdef971.tar.xz
(svn r14223) -Codechange: make GetSprite aware of the 4 different types of sprites: fonts, recolour, mapgen and normal sprites.
Diffstat (limited to 'src/fontcache.cpp')
-rw-r--r--src/fontcache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index ab7c9c5d1..28924885d 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -401,7 +401,7 @@ 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);
+ return GetSprite(sprite, ST_FONT);
}
/* Check for the glyph in our cache */
@@ -470,7 +470,7 @@ uint GetGlyphWidth(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 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);