[Scummvm-cvs-logs] CVS: scummvm/graphics font.cpp,1.15,1.16 newfont_big.cpp,1.6,1.7

[Eugene Sandulenko]

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

Modified Files:
	font.cpp newfont_big.cpp 
Log Message:
Plug in better font. Unfortunately we can't use Arial12 which Krest put on
his mock-ups due to license restrictions, i.e. Microsoft prohibits any
reverse engineering and modifications of it and we need to convert it into
raster font.

Fortunately there are free fonts in the wild. I tried Bitstream Vera, but it
looked too wide, or crappy if horizontal resolution was altered. Next try
was Adobe Helvetica from X.org. Only requirement is to verbose copyright
notice and disclaimer.

However we will need both bold (provided) and normal wieghts of font in new
GUI for use in text inputs. This is work to do.


Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/font.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- font.cpp	18 Jan 2006 17:39:35 -0000	1.15
+++ font.cpp	31 Jan 2006 03:11:40 -0000	1.16
@@ -38,7 +38,7 @@
 	assert(dst != 0);
 	byte *ptr = (byte *)dst->getBasePtr(tx, ty);
 
-	assert(desc.bits != 0 && desc.maxwidth <= 16);
+	assert(desc.bits != 0 && desc.maxwidth <= 17);
 	assert(dst->bytesPerPixel == 1 || dst->bytesPerPixel == 2);
 
 	// If this character is not included in the font, use the default char.

Index: newfont_big.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/newfont_big.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- newfont_big.cpp	27 Nov 2005 02:35:57 -0000	1.6
+++ newfont_big.cpp	31 Jan 2006 03:11:40 -0000	1.7
@@ -1,19 +1,39 @@
-/* Generated by convbdf on Sun May 15 19:05:47 2005. */
+/* Generated by convbdf on Tue Jan 31 04:56:53 2006. */
 #include "common/stdafx.h"
 #include "graphics/font.h"
 
 /* Font information:
-   name: xtal-14
-   facename: -classic-xtal-Medium-R-Normal--14-140-75-75-P-74-ISO8859-1
-   w x h: 12x14
-   size: 224
+   name: helvB12
[...46400 lines suppressed...]
-	32,
-	224,
+	0,
+	8818,
 	_font_bits,
 	_sysfont_offset,
 	_sysfont_width,
-	32,
+	0,
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_sysfont_big(desc);
-#else
-DEFINE_FONT(g_sysfont_big)
-#endif
-
 
 } // End of namespace Graphics