Moved the GFX_ constants to sdl-common.h, where they belong.

svn-id: r17479

4 files changed, 21 insertions, 17 deletions

diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index a46ea7e318..6735c50973 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -57,6 +57,7 @@ enum {
 
 // gfx modes
 enum {
+	GFX_NORMAL = 0,
 	GFX_FLIPPING = 100,	// Palmos
 	GFX_BUFFERED = 101,	// Palmos
 	GFX_WIDE = 102 // palmos
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index 57e7625b93..fa8959f001 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -36,6 +36,22 @@
 #define USE_OSD	1
 #endif
 
+
+enum {
+	GFX_NORMAL = 0,
+	GFX_DOUBLESIZE = 1,
+	GFX_TRIPLESIZE = 2,
+	GFX_2XSAI = 3,
+	GFX_SUPER2XSAI = 4,
+	GFX_SUPEREAGLE = 5,
+	GFX_ADVMAME2X = 6,
+	GFX_ADVMAME3X = 7,
+	GFX_HQ2X = 8,
+	GFX_HQ3X = 9,
+	GFX_TV2X = 10,
+	GFX_DOTMATRIX = 11
+};
+
 static const int s_gfxModeSwitchTable[][4] = {
 		{ GFX_NORMAL, GFX_DOUBLESIZE, GFX_TRIPLESIZE, -1 },
 		{ GFX_NORMAL, GFX_ADVMAME2X, GFX_ADVMAME3X, -1 },
diff --git a/base/engine.cpp b/base/engine.cpp
index df3f49cb57..6ef04ac2f2 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -28,7 +28,6 @@
 #include "common/file.h"
 #include "common/timer.h"
 #include "common/savefile.h"
-#include "common/scaler.h"	// For GFX_NORMAL
 #include "common/system.h"
 #include "sound/mixer.h"
 
@@ -65,7 +64,10 @@ void Engine::initCommonGFX(GameDetector &detector) {
 
 	// See if the game should default to 1x scaler
 	if (useDefaultGraphicsMode && (detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
-		_system->setGraphicsMode(GFX_NORMAL);
+		// FIXME: As a hack, we use "1x" here. Would be nicer to use
+		// getDefaultGraphicsMode() instead, but right now, we do not specify
+		// whether that is a 1x scaler or not...
+		_system->setGraphicsMode(_system->getDefaultGraphicsMode());
 	} else {
 		// Override global scaler with any game-specific define
 		if (ConfMan.hasKey("gfx_mode")) {
diff --git a/common/scaler.h b/common/scaler.h
index c582e71f79..8460760bf6 100644
--- a/common/scaler.h
+++ b/common/scaler.h
@@ -59,20 +59,5 @@ extern void makeRectStretchable(int &x, int &y, int &w, int &h);
 
 extern int stretch200To240(uint8 *buf, uint32 pitch, int width, int height, int srcX, int srcY, int origSrcY);
 
-enum {
-	GFX_NORMAL = 0,
-	GFX_DOUBLESIZE = 1,
-	GFX_TRIPLESIZE = 2,
-	GFX_2XSAI = 3,
-	GFX_SUPER2XSAI = 4,
-	GFX_SUPEREAGLE = 5,
-	GFX_ADVMAME2X = 6,
-	GFX_ADVMAME3X = 7,
-	GFX_HQ2X = 8,
-	GFX_HQ3X = 9,
-	GFX_TV2X = 10,
-	GFX_DOTMATRIX = 11
-};
-
 
 #endif