[Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.23,1.24

Max Horn fingolfin at users.sourceforge.net
Thu Jan 6 13:17:43 CET 2005


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14934/backends/sdl

Modified Files:
	graphics.cpp 
Log Message:
Added a font manager (work in progress)

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/graphics.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- graphics.cpp	1 Jan 2005 16:08:47 -0000	1.23
+++ graphics.cpp	6 Jan 2005 21:15:50 -0000	1.24
@@ -24,6 +24,7 @@
 #include "common/scaler.h"
 #include "common/util.h"
 #include "graphics/font.h"
+#include "graphics/fontman.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{"1x", "Normal (no scaling)", GFX_NORMAL},
@@ -1234,8 +1235,7 @@
 	dst.bytesPerPixel = _osdSurface->format->BytesPerPixel;
 	
 	// The font we are going to use:
-//	const Graphics::Font *font = &Graphics::g_sysfont;
-	const Graphics::Font *font = &Graphics::g_scummfont;
+	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kOSDFont);
 	
 	// Clear everything with the "transparent" color, i.e. the colorkey
 	SDL_FillRect(_osdSurface, 0, kOSDColorKey);





More information about the Scummvm-git-logs mailing list