diff options
| -rw-r--r-- | scumm/scumm.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index b6ba0bccfa..fe8ca0ee92 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1222,12 +1222,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _hexdumpScripts = false; _showStack = false; - // FIXME: a dirty hack. Currently this is checked before engine - // creation. - if (_heversion >= 71) { - _features |= GF_DEFAULT_TO_1X_SCALER; - } - if (_platform == Common::kPlatformFMTowns && _version == 3) { // FM-TOWNS V3 games use 320x240 _screenWidth = 320; _screenHeight = 240; @@ -1464,13 +1458,6 @@ int ScummEngine::init(GameDetector &detector) { if (_features & GF_DEFAULT_TO_1X_SCALER) _system->setGraphicsMode("1x"); } - - // FIXME: All this seems a dirty hack to me. We already - // have this check in constructor - if (_heversion >= 71) { - _features |= GF_DEFAULT_TO_1X_SCALER; - } - _system->endGFXTransaction(); // On some systems it's not safe to run CD audio games from the CD. @@ -2953,11 +2940,15 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { if (g->name) { game = *g; game.name = name; - if (game.description) g_system->setWindowCaption(game.description); } } + // Starting from version 7.1, HE games use 640x480. We check this here since multiple + // versions _could_ use different resolutions (I haven't verified this, though). + if (game.heversion >= 71) { + game.features |= GF_DEFAULT_TO_1X_SCALER; + } // TODO: REMOVE DEPRECATED OPTION // (Perhaps GUI should display a messagebox on encountering an unknown key?) @@ -2973,12 +2964,6 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { game.midi = MDT_TOWNS; } - // Special cases for HE games - // Games starting freddi use 640x480 - if (game.heversion >= 71) { - game.features |= GF_DEFAULT_TO_1X_SCALER; - } - switch (game.version) { case 1: case 2: |