aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTravis Howell2002-12-21 00:27:10 +0000
committerTravis Howell2002-12-21 00:27:10 +0000
commit368a9917f7c05a2fbb780df7634b00e57aa51ab3 (patch)
tree59799f381e6b333415ea68e27327c4763c3b3265 /common
parent7de2c661940c2df1d6f559c7f507ee99c86fbbf6 (diff)
downloadscummvm-rg350-368a9917f7c05a2fbb780df7634b00e57aa51ab3.tar.gz
scummvm-rg350-368a9917f7c05a2fbb780df7634b00e57aa51ab3.tar.bz2
scummvm-rg350-368a9917f7c05a2fbb780df7634b00e57aa51ab3.zip
Add debug command line fix and config option, patch #655822
svn-id: r6034
Diffstat (limited to 'common')
-rw-r--r--common/gameDetector.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 2554323068..2f494776c3 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -200,7 +200,7 @@ GameDetector::GameDetector()
_amiga = false;
_talkSpeed = 60;
- _debugLevel = 1;
+ _debugLevel = 0;
_debugMode = 0;
_noSubtitles = false;
_bootParam = 0;
@@ -278,11 +278,19 @@ void GameDetector::updateconfig()
_sfx_volume = g_config->getInt("sfx_volume", _sfx_volume);
+ _debugLevel = g_config->getInt("debuglevel", _debugLevel);
+ if (_debugLevel > 0) {
+ _debugMode = true;
+ debug(1, "Debuglevel (from config): %d", _debugLevel);
+ }
+
// We use strtol for the tempo to allow it to be specified in hex.
if ((val = g_config->get("tempo")))
_gameTempo = strtol(val, NULL, 0);
_talkSpeed = g_config->getInt("talkspeed", _talkSpeed);
+
+
}
void GameDetector::list_games()
@@ -350,7 +358,7 @@ void GameDetector::parseCommandLine(int argc, char **argv)
HANDLE_OPT_OPTION();
if (option != NULL)
_debugLevel = atoi(option);
- debug(1,"Debugmode (level %d) on", _debugLevel);
+ debug(1,"Debuglevel (from command line): %d", _debugLevel);
break;
case 'e':
HANDLE_OPTION();