From 028cc42f2b8e453be5d6f0dd2a65556dbf3d6911 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 6 Feb 2005 18:12:29 +0000
Subject: Moved the console font from gui to graphics

svn-id: r16742
---
 graphics/fontman.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'graphics/fontman.cpp')

diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index cc7675fd96..e0ca9e5997 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -21,10 +21,6 @@
 #include "graphics/fontman.h"
 //#include "gui/consolefont.h"
 
-namespace GUI {
-	extern const Graphics::NewFont g_consolefont;
-}
-
 DECLARE_SINGLETON(Graphics::FontManager);
 
 namespace Graphics {
@@ -32,6 +28,7 @@ namespace Graphics {
 const ScummFont g_scummfont;
 extern const NewFont g_sysfont;
 extern const NewFont g_sysfont_big;
+extern const NewFont g_consolefont;
 
 
 FontManager::FontManager() {
@@ -45,7 +42,7 @@ const Font *FontManager::getFontByUsage(FontUsage usage) const {
 	case kOSDFont:
 		return &g_scummfont;
 	case kConsoleFont:
-		return &GUI::g_consolefont;
+		return &g_consolefont;
 	case kGUIFont:
 		return &g_sysfont;
 	case kBigGUIFont:
-- 
cgit v1.2.3