aboutsummaryrefslogtreecommitdiff
path: root/base/engine.cpp
diff options
context:
space:
mode:
authorMax Horn2006-02-17 00:01:18 +0000
committerMax Horn2006-02-17 00:01:18 +0000
commita96760a2fdf32a1dc3c6cb44cfd247e4b1b3ab79 (patch)
tree499b85db76c71d966c30aa0b35deb35a68642a0c /base/engine.cpp
parentfde1da92f068f700d82774360dd6cd05c6c0adcc (diff)
downloadscummvm-rg350-a96760a2fdf32a1dc3c6cb44cfd247e4b1b3ab79.tar.gz
scummvm-rg350-a96760a2fdf32a1dc3c6cb44cfd247e4b1b3ab79.tar.bz2
scummvm-rg350-a96760a2fdf32a1dc3c6cb44cfd247e4b1b3ab79.zip
Reduced use of GF_DEFAULT_TO_1X_SCALER in favor of a new param to Engine::initCommonGFX; added a TODO stating that it should eventually be removed completly
svn-id: r20738
Diffstat (limited to 'base/engine.cpp')
-rw-r--r--base/engine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index c92caacdc2..38e2b9e0dc 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -60,7 +60,7 @@ Engine::~Engine() {
g_engine = NULL;
}
-void Engine::initCommonGFX(GameDetector &detector) {
+void Engine::initCommonGFX(GameDetector &detector, bool defaultTo1XScaler) {
const bool useDefaultGraphicsMode =
!ConfMan.hasKey("gfx_mode", Common::ConfigManager::kTransientDomain) &&
(
@@ -70,7 +70,7 @@ void Engine::initCommonGFX(GameDetector &detector) {
);
// See if the game should default to 1x scaler
- if (useDefaultGraphicsMode && (detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
+ if (useDefaultGraphicsMode && defaultTo1XScaler) {
// 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...