[Scummvm-cvs-logs] CVS: scummvm/graphics consolefont.cpp,NONE,1.1 module.mk,1.4,1.5 fontman.cpp,1.5,1.6

[Max Horn]

Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4950/graphics

Modified Files:
	module.mk fontman.cpp 
Added Files:
	consolefont.cpp 
Log Message:
Moved the console font from gui to graphics

--- NEW FILE: consolefont.cpp ---
/* Generated by convbdf on Sun Aug 15 16:38:06 2004. */
#include "common/stdafx.h"
#include "graphics/font.h"

/* Font information:
   name: 5x7
   facename: -Misc-Fixed-Medium-R-Normal--7-70-75-75-C-50-ISO8859-1
   w x h: 5x7
   size: 256
   ascent: 6
   descent: 1
   first char: 0 (0x00)
   last char: 255 (0xff)
   default char: 0 (0x00)
   proportional: no
   Copyright 1991, 1998 The Open Group
*/

namespace Graphics {
[...4743 lines suppressed...]
};

/* Exported structure definition. */
static const FontDesc desc = {
	"5x7",
	5,
	7,
	6,
	0,
	256,
	_font_bits,
	_sysfont_offset,
	0,  /* fixed width*/
	0,
	sizeof(_font_bits)/sizeof(bitmap_t)
};

extern const NewFont g_consolefont(desc);

} // End of namespace Graphics

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/module.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- module.mk	6 Jan 2005 22:48:41 -0000	1.4
+++ module.mk	6 Feb 2005 18:12:29 -0000	1.5
@@ -2,11 +2,12 @@
 
 MODULE_OBJS := \
 	graphics/animation.o \
-	graphics/scummfont.o \
+	graphics/consolefont.o \
 	graphics/font.o \
 	graphics/fontman.o \
 	graphics/newfont.o \
 	graphics/newfont_big.o \
+	graphics/scummfont.o \
 	graphics/surface.o
 
 MODULE_DIRS += \

Index: fontman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/fontman.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fontman.cpp	7 Jan 2005 00:08:54 -0000	1.5
+++ fontman.cpp	6 Feb 2005 18:12:29 -0000	1.6
@@ -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 @@
 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 @@
 	case kOSDFont:
 		return &g_scummfont;
 	case kConsoleFont:
-		return &GUI::g_consolefont;
+		return &g_consolefont;
 	case kGUIFont:
 		return &g_sysfont;
 	case kBigGUIFont: