aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2005-04-09 13:31:47 +0000
committerMax Horn2005-04-09 13:31:47 +0000
commit3aba4997f4132846072a4fa395218c8723be165e (patch)
tree7103c4ae865edab913dae5e21ec0f64b1b252013 /base
parent37c0af9a2d9a1814cfaa9f1f3468c4f70e1c09d6 (diff)
downloadscummvm-rg350-3aba4997f4132846072a4fa395218c8723be165e.tar.gz
scummvm-rg350-3aba4997f4132846072a4fa395218c8723be165e.tar.bz2
scummvm-rg350-3aba4997f4132846072a4fa395218c8723be165e.zip
Moved the GFX_ constants to sdl-common.h, where they belong.
svn-id: r17479
Diffstat (limited to 'base')
-rw-r--r--base/engine.cpp6
1 files changed, 4 insertions, 2 deletions
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")) {