diff options
author | rubidium <rubidium@openttd.org> | 2014-01-02 22:41:58 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2014-01-02 22:41:58 +0000 |
commit | 2618d960e30882c097ba8b68249bbae974700ac8 (patch) | |
tree | 3d5a349c6a13f6f843d5f6b56456faf91010af5b /src/fontcache.cpp | |
parent | 456dba4889108027f8af9c94514978d06012b6e7 (diff) | |
download | openttd-2618d960e30882c097ba8b68249bbae974700ac8.tar.xz |
(svn r26209) -Codechange: remove some template magic and simplify some code
Diffstat (limited to 'src/fontcache.cpp')
-rw-r--r-- | src/fontcache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 37f949c87..50fbe0d6a 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -439,7 +439,7 @@ static void *AllocateFont(size_t size) static bool GetFontAAState(FontSize size) { /* AA is only supported for 32 bpp */ - if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() != 32) return false; + if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 32) return false; switch (size) { default: NOT_REACHED(); @@ -494,7 +494,7 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key) builtin_questionmark_data }; - Sprite *spr = BlitterFactoryBase::GetCurrentBlitter()->Encode(&builtin_questionmark, AllocateFont); + Sprite *spr = BlitterFactory::GetCurrentBlitter()->Encode(&builtin_questionmark, AllocateFont); assert(spr != NULL); new_glyph.sprite = spr; new_glyph.width = spr->width + (this->fs != FS_NORMAL); @@ -551,7 +551,7 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key) } } - new_glyph.sprite = BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, AllocateFont); + new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont); new_glyph.width = slot->advance.x >> 6; this->SetGlyphPtr(key, &new_glyph); |