1 files changed, 11 insertions, 28 deletions

diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index fea29f4489..05abb4e4c7 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -29,26 +29,17 @@ DECLARE_SINGLETON(Graphics::FontManager);
 
 namespace Graphics {
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
-const ScummFont g_scummfont;
-extern const NewFont g_sysfont;
-extern const NewFont g_sysfont_big;
-extern const NewFont g_consolefont;
-
-FontManager::FontManager() {
-}
-
-#else
 const ScummFont *g_scummfont;
 extern const NewFont *g_sysfont;
 extern const NewFont *g_sysfont_big;
 extern const NewFont *g_consolefont;
 
-static bool g_initialized = false;
-void initfonts() {
-	if (!g_initialized) {
+static bool s_initialized = false;
+
+FontManager::FontManager() {
+	if (!s_initialized) {
 		// FIXME : this need to be freed
-		g_initialized = true;
+		s_initialized = true;
 		g_scummfont = new ScummFont;
 		INIT_FONT(g_sysfont)
 		INIT_FONT(g_sysfont_big)
@@ -56,10 +47,13 @@ void initfonts() {
 	}
 }
 
-FontManager::FontManager() {
-	initfonts();
+FontManager::~FontManager() {
+	s_initialized = false;
+	delete g_scummfont;
+	delete g_sysfont;
+	delete g_sysfont_big;
+	delete g_consolefont;
 }
-#endif
 
 const Font *FontManager::getFontByName(const Common::String &name) const {
 	if (!_fontMap.contains(name))
@@ -69,16 +63,6 @@ const Font *FontManager::getFontByName(const Common::String &name) const {
 
 const Font *FontManager::getFontByUsage(FontUsage usage) const {
 	switch (usage) {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
-	case kOSDFont:
-		return &g_scummfont;
-	case kConsoleFont:
-		return &g_consolefont;
-	case kGUIFont:
-		return &g_sysfont;
-	case kBigGUIFont:
-		return &g_sysfont_big;
-#else
 	case kOSDFont:
 		return g_scummfont;
 	case kConsoleFont:
@@ -87,7 +71,6 @@ const Font *FontManager::getFontByUsage(FontUsage usage) const {
 		return g_sysfont;
 	case kBigGUIFont:
 		return g_sysfont_big;
-#endif
 	}
 
 	return 0;