Ticket #8149: dlfix

File dlfix, 1.6 KB (added by SF/mnepomuk, 21 years ago)
Line 
1diff -u -r -w -N scummvm/scummvm/common/gameDetector.cpp myscummvm/scummvm/common/gameDetector.cpp
2--- scummvm/scummvm/common/gameDetector.cpp 2002-12-18 17:16:11.000000000 +0100
3+++ myscummvm/scummvm/common/gameDetector.cpp 2002-12-19 16:10:12.000000000 +0100
4@@ -278,6 +278,11 @@
5
6 _sfx_volume = g_config->getInt("sfx_volume", _sfx_volume);
7
8+ _debugLevel = g_config->getInt("debuglevel", _debugLevel);
9+ debug(1, "Debuglevel (from config): %d", _debugLevel);
10+ if (_debugLevel > 1)
11+ _debugMode = true;
12+
13 // We use strtol for the tempo to allow it to be specified in hex.
14 if ((val = g_config->get("tempo")))
15 _gameTempo = strtol(val, NULL, 0);
16@@ -350,7 +355,7 @@
17 HANDLE_OPT_OPTION();
18 if (option != NULL)
19 _debugLevel = atoi(option);
20- debug(1,"Debugmode (level %d) on", _debugLevel);
21+ debug(1,"Debuglevel (from command line): %d", _debugLevel);
22 break;
23 case 'e':
24 HANDLE_OPTION();
25diff -u -r -w -N scummvm/scummvm/scumm/scummvm.cpp myscummvm/scummvm/scumm/scummvm.cpp
26--- scummvm/scummvm/scumm/scummvm.cpp 2002-12-18 17:16:23.000000000 +0100
27+++ myscummvm/scummvm/scumm/scummvm.cpp 2002-12-19 15:46:39.000000000 +0100
28@@ -49,6 +49,7 @@
29 ScummDebugger g_debugger;
30
31 extern NewGui *g_gui;
32+extern uint16 _debugLevel;
33
34 Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst)
35 {
36@@ -79,6 +80,7 @@
37 g_scumm = this;
38
39 _debugMode = detector->_debugMode;
40+ _debugLevel = detector->_debugLevel;
41 _bootParam = detector->_bootParam;
42 _exe_name = (char*)detector->_gameRealName.c_str();
43 _game_name = (char*)detector->_gameFileName.c_str();