[Scummvm-cvs-logs] CVS: scummvm/gui module.mk,1.16,1.17 console.cpp,1.56,1.57 consolefont.cpp,1.1,NONE

Max Horn fingolfin at users.sourceforge.net
Sun Feb 6 10:15:17 CET 2005


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

Modified Files:
	module.mk console.cpp 
Removed Files:
	consolefont.cpp 
Log Message:
Moved the console font from gui to graphics

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/module.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- module.mk	29 Jan 2005 16:30:51 -0000	1.16
+++ module.mk	6 Feb 2005 18:12:26 -0000	1.17
@@ -5,7 +5,6 @@
 	gui/browser.o \
 	gui/chooser.o \
 	gui/console.o \
-	gui/consolefont.o \
 	gui/dialog.o \
 	gui/editable.o \
 	gui/EditTextWidget.o \

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- console.cpp	10 Jan 2005 22:05:37 -0000	1.56
+++ console.cpp	6 Feb 2005 18:12:28 -0000	1.57
@@ -29,9 +29,12 @@
 
 #include "graphics/font.h"
 
-namespace GUI {
+namespace Graphics {
+extern const NewFont g_consolefont;
+}
+using Graphics::g_consolefont;
 
-extern const Graphics::NewFont g_consolefont;
+namespace GUI {
 
 #define kConsoleCharWidth	(g_consolefont.getMaxCharWidth())
 #define kConsoleLineHeight	(g_consolefont.getFontHeight() + 2)

--- consolefont.cpp DELETED ---





More information about the Scummvm-git-logs mailing list