[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.h,1.26,1.27 gameDetector.cpp,1.69,1.70

[Max Horn]

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

Modified Files:
	gameDetector.h gameDetector.cpp 
Log Message:
avoid #include scaler.h

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gameDetector.h	18 Jan 2004 20:46:11 -0000	1.26
+++ gameDetector.h	22 Feb 2004 21:01:39 -0000	1.27
@@ -24,7 +24,6 @@
 #define GAMEDETECTOR_H
 
 #include "common/str.h"
-#include "common/scaler.h"
 
 class Engine;
 class GameDetector;
@@ -61,36 +60,7 @@
 	int id;
 };
 
-/**
- * List of graphic 'modes' we potentially support. Potentially because not all
- * backends actually support all the filters listed here. At this point only
- * the SDL backend supports all (except for the PalmOS ones of course).
- * @todo Remove this explicit list of graphic modes and rather extend the
- * OSystem API to allow querying a backend for the modes it supports.
- */
-static const struct GraphicsMode gfx_modes[] = {
-	{"normal", "Normal (no scaling)", GFX_NORMAL},
-	{"1x", "Normal (no scaling)", GFX_NORMAL},
-#ifndef __PALM_OS__     // reduce contant data size
-	{"2x", "2x", GFX_DOUBLESIZE},
-	{"3x", "3x", GFX_TRIPLESIZE},
-	{"2xsai", "2xSAI", GFX_2XSAI},
-	{"super2xsai", "Super2xSAI", GFX_SUPER2XSAI},
-	{"supereagle", "SuperEagle", GFX_SUPEREAGLE},
-	{"advmame2x", "AdvMAME2x", GFX_ADVMAME2X},
-	{"advmame3x", "AdvMAME3x", GFX_ADVMAME3X},
-	{"hq2x", "HQ2x", GFX_HQ2X},
-	{"hq3x", "HQ3x", GFX_HQ3X},
-	{"tv2x", "TV2x", GFX_TV2X},
-	{"dotmatrix", "DotMatrix", GFX_DOTMATRIX},
-#else
-	{"flipping", "Page Flipping", GFX_FLIPPING},
-	{"buffered", "Buffered", GFX_BUFFERED},
-	{"wide", "Wide (HiRes+ only)", GFX_WIDE},
-#endif
-	{0, 0, 0}
-};
-
+extern const GraphicsMode g_gfx_modes[];
 
 class GameDetector {
 	typedef Common::String String;

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- gameDetector.cpp	13 Feb 2004 10:51:32 -0000	1.69
+++ gameDetector.cpp	22 Feb 2004 21:01:39 -0000	1.70
@@ -96,6 +96,36 @@
 ;
 #endif
 
+/**
+ * List of graphic 'modes' we potentially support. Potentially because not all
+ * backends actually support all the filters listed here. At this point only
+ * the SDL backend supports all (except for the PalmOS ones of course).
+ * @todo Remove this explicit list of graphic modes and rather extend the
+ * OSystem API to allow querying a backend for the modes it supports.
+ */
+const GraphicsMode g_gfx_modes[] = {
+	{"normal", "Normal (no scaling)", GFX_NORMAL},
+	{"1x", "Normal (no scaling)", GFX_NORMAL},
+#ifndef __PALM_OS__     // reduce contant data size
+	{"2x", "2x", GFX_DOUBLESIZE},
+	{"3x", "3x", GFX_TRIPLESIZE},
+	{"2xsai", "2xSAI", GFX_2XSAI},
+	{"super2xsai", "Super2xSAI", GFX_SUPER2XSAI},
+	{"supereagle", "SuperEagle", GFX_SUPEREAGLE},
+	{"advmame2x", "AdvMAME2x", GFX_ADVMAME2X},
+	{"advmame3x", "AdvMAME3x", GFX_ADVMAME3X},
+	{"hq2x", "HQ2x", GFX_HQ2X},
+	{"hq3x", "HQ3x", GFX_HQ3X},
+	{"tv2x", "TV2x", GFX_TV2X},
+	{"dotmatrix", "DotMatrix", GFX_DOTMATRIX},
+#else
+	{"flipping", "Page Flipping", GFX_FLIPPING},
+	{"buffered", "Buffered", GFX_BUFFERED},
+	{"wide", "Wide (HiRes+ only)", GFX_WIDE},
+#endif
+	{0, 0, 0}
+};
+
 GameDetector::GameDetector() {
 
 	// Graphics
@@ -468,7 +498,7 @@
 		return -1;
 
 	const char *s = str.c_str();
-	const GraphicsMode *gm = gfx_modes;
+	const GraphicsMode *gm = g_gfx_modes;
 	while (gm->name) {
 		if (!scumm_stricmp(gm->name, s)) {
 			return gm->id;