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

Max Horn fingolfin at users.sourceforge.net
Sun Mar 21 13:31:12 CET 2004


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

Modified Files:
	graphics.cpp 
Log Message:
Moved Surface/Font code into new 'graphics' module

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/graphics.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- graphics.cpp	15 Mar 2004 19:07:55 -0000	1.6
+++ graphics.cpp	21 Mar 2004 21:20:25 -0000	1.7
@@ -23,7 +23,7 @@
 #include "backends/sdl/sdl-common.h"
 #include "common/scaler.h"
 #include "common/util.h"
-#include "gui/font.h"
+#include "graphics/font.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{"1x", "Normal (no scaling)", GFX_NORMAL},
@@ -1180,7 +1180,7 @@
 	if (SDL_LockSurface(_osdSurface))
 		error("displayMessageOnOSD: SDL_LockSurface failed: %s", SDL_GetError());
 
-	GUI::Surface dst;
+	Graphics::Surface dst;
 	dst.pixels = _osdSurface->pixels;
 	dst.w = _osdSurface->w;
 	dst.h = _osdSurface->h;
@@ -1188,8 +1188,8 @@
 	dst.bytesPerPixel = _osdSurface->format->BytesPerPixel;
 	
 	// The font we are going to use:
-//	const GUI::Font *font = &GUI::g_sysfont;
-	const GUI::Font *font = &GUI::g_scummfont;
+//	const Graphics::Font *font = &Graphics::g_sysfont;
+	const Graphics::Font *font = &Graphics::g_scummfont;
 	
 	// Clear everything with the "transparent" color, i.e. the colorkey
 	SDL_FillRect(_osdSurface, 0, kOSDColorKey);
@@ -1236,7 +1236,7 @@
 		font->drawString(&dst, lines[i],
 							osdRect.x, osdRect.y + i * lineHeight + vOffset + lineSpacing, osdRect.w,
 							SDL_MapRGB(_osdSurface->format, 255, 255, 255),
-							GUI::kTextAlignCenter);
+							Graphics::kTextAlignCenter);
 	}
 
 	// Finished drawing, so unlock the OSD surface again





More information about the Scummvm-git-logs mailing list