From 1574d644e8e3d32d9bf9a05aefabb82f877e05cd Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 7 Jan 2012 01:16:33 +0100 Subject: GRAPHICS: Let FontManager::setFont accept an "const BdfFont *". As the documentation points out this method currently only works for BDF fonts, thus it is safer to let it actually just accept such. --- graphics/fontman.cpp | 8 ++++---- graphics/fontman.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'graphics') diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp index 9c7285ef2f..8d967d595f 100644 --- a/graphics/fontman.cpp +++ b/graphics/fontman.cpp @@ -93,19 +93,19 @@ bool FontManager::assignFontToName(const Common::String &name, const Font *font) return true; } -bool FontManager::setFont(FontUsage usage, const Font *font) { +bool FontManager::setFont(FontUsage usage, const BdfFont *font) { switch (usage) { case kConsoleFont: delete g_consolefont; - g_consolefont = (const BdfFont *)font; + g_consolefont = font; break; case kGUIFont: delete g_sysfont; - g_sysfont = (const BdfFont *)font; + g_sysfont = font; break; case kBigGUIFont: delete g_sysfont_big; - g_sysfont_big = (const BdfFont *)font; + g_sysfont_big = font; break; default: return false; diff --git a/graphics/fontman.h b/graphics/fontman.h index e229860f24..42f7d856fa 100644 --- a/graphics/fontman.h +++ b/graphics/fontman.h @@ -32,6 +32,7 @@ namespace Graphics { class Font; +class BdfFont; class FontManager : public Common::Singleton { public: @@ -75,7 +76,7 @@ public: * @param font the font object * @return true on success, false on failure */ - bool setFont(FontUsage usage, const Font *font); + bool setFont(FontUsage usage, const BdfFont *font); /** * Removes binding from name to font -- cgit v1.2.3