[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/graphics fontman.cpp,NONE,1.1 fontman.h,NONE,1.1 font.cpp,1.5,1.6 font.h,1.4,1.5 module.mk,1.2,1.3 newfont.cpp,1.3,1.4 scummfont.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.95,1.96 newgui.h,1.51,1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/graphics fontman.cpp,NONE,1.1 fontman.h,NONE,1.1 font.cpp,1.5,1.6 font.h,1.4,1.5 module.mk,1.2,1.3 newfont.cpp,1.3,1.4 scummfont.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.95,1.96 newgui.h,1.51,1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list