aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2006-02-16 23:24:23 +0000
committerMax Horn2006-02-16 23:24:23 +0000
commit405733e044e5ccb454d0b022a8b6eabaa757824d (patch)
tree9abac03604d79152e8a3ca182788daacaa24c3e8 /engines/scumm
parentc26af987c20955e6b2a3d97f9cc4e6aa6cb36bdd (diff)
downloadscummvm-rg350-405733e044e5ccb454d0b022a8b6eabaa757824d.tar.gz
scummvm-rg350-405733e044e5ccb454d0b022a8b6eabaa757824d.tar.bz2
scummvm-rg350-405733e044e5ccb454d0b022a8b6eabaa757824d.zip
- Fixed a bug that prevented you from overriding the scaler from the command
line for 640x480 games. - Updated NEWS file a bit svn-id: r20736
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 337261ee45..4d290108bc 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1804,16 +1804,14 @@ int ScummEngine::init(GameDetector &detector) {
// Initialize backend
_system->beginGFXTransaction();
- initCommonGFX(detector);
if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
_system->initSize(Common::kHercW, Common::kHercH, 1);
_features |= GF_DEFAULT_TO_1X_SCALER;
- _system->setGraphicsMode("1x");
+ detector._game.features |= GF_DEFAULT_TO_1X_SCALER;
} else {
_system->initSize(_screenWidth, _screenHeight, (detector._force1xOverlay ? 1 : 2));
- if (_features & GF_DEFAULT_TO_1X_SCALER)
- _system->setGraphicsMode("1x");
}
+ initCommonGFX(detector);
_system->endGFXTransaction();
// On some systems it's not safe to run CD audio games from the CD.