Changed the way NewFonts are instantiated (will make it easier to add multiple fonts)

svn-id: r14625

1 files changed, 6 insertions, 22 deletions

diff --git a/graphics/newfont.cpp b/graphics/newfont.cpp
index a308bb6656..f87b2fa3d1 100644
--- a/graphics/newfont.cpp
+++ b/graphics/newfont.cpp
@@ -1,4 +1,4 @@
-/* Generated by convbdf on Thu Nov 20 00:15:51 2003. */
+/* Generated by convbdf on Sun Aug 15 15:59:36 2004. */
 #include "common/stdafx.h"
 #include "graphics/font.h"
 
@@ -2565,24 +2565,7 @@ static const unsigned char _sysfont_width[] = {
 };
 
 /* Exported structure definition. */
-NewFont::NewFont() {
-	name = "04b-16b-10";
-	maxwidth = 9;
-	height = 10;
-	ascent = 8;
-	firstchar = 33;
-	size = 94;
-	bits = _font_bits;
-	offset = 0;  /* no encode table*/
-	width = _sysfont_width;
-	defaultchar = 33;
-	bits_size = sizeof(_font_bits)/sizeof(bitmap_t);
-}
-
-const NewFont g_sysfont;
-
-#if 0
-const Font g_sysfont = {
+static const FontDesc desc = {
 	"04b-16b-10",
 	9,
 	10,
@@ -2593,8 +2576,9 @@ const Font g_sysfont = {
 	0,  /* no encode table*/
 	_sysfont_width,
 	33,
-	sizeof(_font_bits)/sizeof(bitmap_t),
+	sizeof(_font_bits)/sizeof(bitmap_t)
 };
-#endif
 
-} // End of namespace Graphics
+const NewFont g_sysfont(desc);
+
+} // End of namespace GUI