[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.36,1.37

[Max Horn]

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

Modified Files:
	engine.cpp 
Log Message:
Moved the GFX_ constants to sdl-common.h, where they belong.

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- engine.cpp	9 Apr 2005 01:52:42 -0000	1.36
+++ engine.cpp	9 Apr 2005 13:31:46 -0000	1.37
@@ -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 @@
 
 	// 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")) {