diff options
| -rw-r--r-- | base/gameDetector.cpp | 3 | ||||
| -rw-r--r-- | base/gameDetector.h | 1 | ||||
| -rw-r--r-- | queen/queen.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 6 | ||||
| -rw-r--r-- | simon/simon.cpp | 2 | ||||
| -rw-r--r-- | sky/sky.cpp | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 2b85fa998c..05aa52573c 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -221,7 +221,6 @@ GameDetector::GameDetector() { ConfMan.registerDefault("joystick_num", -1); ConfMan.registerDefault("confirm_exit", false); - _debugMode = (ConfMan.getInt("debuglevel") >= 0); _dumpScripts = false; _midi_driver = MD_AUTO; @@ -311,7 +310,6 @@ void GameDetector::parseCommandLine(int argc, char **argv) { ConfMan.set("cdrom", (int)strtol(option, 0, 10)); break; case 'd': - _debugMode = true; HANDLE_OPT_OPTION(); if (option != NULL) ConfMan.set("debuglevel", (int)strtol(option, 0, 10)); @@ -478,7 +476,6 @@ ShowHelpAndExit: void GameDetector::setTarget(const String &name) { _targetName = name; ConfMan.setActiveDomain(name); - _debugMode = (ConfMan.getInt("debuglevel") >= 0); } int GameDetector::parseGraphicsMode(const String &str) { diff --git a/base/gameDetector.h b/base/gameDetector.h index a236d0b479..3e5eef7fca 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -106,7 +106,6 @@ public: GameSettings _game; const Plugin *_plugin; - bool _debugMode; bool _dumpScripts; bool _saveconfig; diff --git a/queen/queen.cpp b/queen/queen.cpp index e4ab380c8e..ce85ade2db 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -64,7 +64,7 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst) _mixer->setVolume(ConfMan.getInt("sfx_volume")); - _debugMode = detector->_debugMode; + _debugMode = ConfMan.hasKey("debuglevel"); _debugLevel = ConfMan.getInt("debuglevel"); _detector = detector; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 43a04876ab..e691797ad5 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -595,7 +595,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst) _debugger = new ScummDebugger(this); // Read settings from the detector & config manager - _debugMode = detector->_debugMode; + _debugMode = ConfMan.hasKey("debuglevel"); _debugLevel = ConfMan.getInt("debuglevel"); _dumpScripts = detector->_dumpScripts; _bootParam = ConfMan.getInt("boot_param"); @@ -887,7 +887,7 @@ void ScummEngine::launch() { VAR(VAR_VERSION) = 21; if (!((_features & GF_MACINTOSH) && (_version == 3))) { - // This is the for the Mac version of Indy3/Loom + // This is NOT for the Mac version of Indy3/Loom VAR(VAR_DEBUGMODE) = _debugMode; } } @@ -1272,7 +1272,7 @@ int ScummEngine::scummLoop(int delta) { VAR(VAR_MOUSE_X) = _mouse.x; VAR(VAR_MOUSE_Y) = _mouse.y; if ((_features & GF_MACINTOSH) && (_version == 3)) { - // This is the for the Mac version of Indy3/Loom + // This is for the Mac version of Indy3/Loom VAR(VAR_DEBUGMODE) = _debugMode; } } diff --git a/simon/simon.cpp b/simon/simon.cpp index ecce6f9c78..62d9d9221b 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -487,7 +487,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) warning ("MIDI Player init failed: \"%s\"", midi.getErrorName (ret)); midi.set_volume(ConfMan.getInt("music_volume")); - _debugMode = detector->_debugMode; + _debugMode = ConfMan.hasKey("debuglevel"); _debugLevel = ConfMan.getInt("debuglevel"); _language = GameDetector::parseLanguage(ConfMan.get("language")); _noSubtitles = ConfMan.getBool("nosubtitles"); diff --git a/sky/sky.cpp b/sky/sky.cpp index e1e681d58e..730553828f 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -106,7 +106,7 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst) _mixer->setVolume(ConfMan.getInt("sfx_volume")); //unnecessary? - _debugMode = detector->_debugMode; + _debugMode = ConfMan.hasKey("debuglevel"); _debugLevel = ConfMan.getInt("debuglevel"); _detector = detector; |