[Scummvm-cvs-logs] CVS: scummvm/graphics consolefont.cpp,1.2,1.3 font.h,1.12,1.13 fontman.cpp,1.8,1.9 newfont.cpp,1.6,1.7 newfont_big.cpp,1.5,1.6

Eugene Sandulenko sev at users.sourceforge.net
Sat Nov 26 18:37:03 CET 2005


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

Modified Files:
	consolefont.cpp font.h fontman.cpp newfont.cpp newfont_big.cpp 
Log Message:
Patch #1341626: "New GP32 port"


Index: consolefont.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/consolefont.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- consolefont.cpp	8 Oct 2005 21:11:44 -0000	1.2
+++ consolefont.cpp	27 Nov 2005 02:35:57 -0000	1.3
@@ -4777,7 +4777,7 @@
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_consolefont(desc);
 #else
 DEFINE_FONT(g_consolefont)

Index: font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/font.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- font.h	18 Oct 2005 01:30:18 -0000	1.12
+++ font.h	27 Nov 2005 02:35:57 -0000	1.13
@@ -116,7 +116,7 @@
 	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
 };
 
-#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 #	define DEFINE_FONT(n) \
 		const NewFont *n;	\
 		void create_##n() {	\

Index: fontman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/fontman.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fontman.cpp	18 Oct 2005 01:30:18 -0000	1.8
+++ fontman.cpp	27 Nov 2005 02:35:57 -0000	1.9
@@ -25,7 +25,7 @@
 
 namespace Graphics {
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 const ScummFont g_scummfont;
 extern const NewFont g_sysfont;
 extern const NewFont g_sysfont_big;
@@ -62,7 +62,7 @@
 
 const Font *FontManager::getFontByUsage(FontUsage usage) const {
 	switch (usage) {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 	case kOSDFont:
 		return &g_scummfont;
 	case kConsoleFont:

Index: newfont.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/newfont.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- newfont.cpp	8 Oct 2005 21:11:45 -0000	1.6
+++ newfont.cpp	27 Nov 2005 02:35:57 -0000	1.7
@@ -2533,10 +2533,10 @@
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_sysfont(desc);
 #else
-DEFINE_FONT(g_sysfont);
+DEFINE_FONT(g_sysfont)
 #endif
 
 } // End of namespace Graphics

Index: newfont_big.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/newfont_big.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- newfont_big.cpp	8 Oct 2005 21:11:45 -0000	1.5
+++ newfont_big.cpp	27 Nov 2005 02:35:57 -0000	1.6
@@ -6987,7 +6987,7 @@
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_sysfont_big(desc);
 #else
 DEFINE_FONT(g_sysfont_big)





More information about the Scummvm-git-logs mailing list