diff options
author | Max Horn | 2006-04-15 13:50:44 +0000 |
---|---|---|
committer | Max Horn | 2006-04-15 13:50:44 +0000 |
commit | 9c4577b6399878d8ddf279e73978d70e086491a9 (patch) | |
tree | 183c018d9d5b44991a3fb74c538625bda6739a97 /engines/scumm | |
parent | aa4214f9401d9ab5c7161c6e2dfeddf3128a2a23 (diff) | |
download | scummvm-rg350-9c4577b6399878d8ddf279e73978d70e086491a9.tar.gz scummvm-rg350-9c4577b6399878d8ddf279e73978d70e086491a9.tar.bz2 scummvm-rg350-9c4577b6399878d8ddf279e73978d70e086491a9.zip |
- Get rid of GameDetector::_dumpScripts and GameDetector::_force1xOverlay in favor of settings in the transient config domain
- This also means you can now set those options in the config file
- Fixed a bug I recently introduced that made bool command line options (like -u, -f) always return 'false' when used in their single letter form
svn-id: r21909
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/scumm.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 042c589718..ed846fa7b9 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -536,7 +536,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const GameSettin // Read settings from the detector & config manager _debugMode = (gDebugLevel >= 0); - _dumpScripts = detector->_dumpScripts; + _dumpScripts = ConfMan.getBool("dump_scripts"); _bootParam = ConfMan.getInt("boot_param"); // Boot params often need debugging switched on to work if (_bootParam) @@ -859,7 +859,12 @@ int ScummEngine::init(GameDetector &detector) { _system->initSize(Common::kHercW, Common::kHercH, 1); defaultTo1XScaler = true; } else { - _system->initSize(_screenWidth, _screenHeight, (detector._force1xOverlay ? 1 : 2)); + // FIXME: The way we now handle the force_1x_overlay setting implies + // that if you start scummvm into the launcher with force_1x_overlay + // set to true, it'll get reset to the default value (usually 'false' + // except for Symbian) before launching a game. + // This may or may not be the desired behavior... + _system->initSize(_screenWidth, _screenHeight, (ConfMan.getBool("force_1x_overlay") ? 1 : 2)); defaultTo1XScaler = (_screenWidth > 320); } initCommonGFX(detector, defaultTo1XScaler); |