diff options
| author | Max Horn | 2004-01-04 14:00:58 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-04 14:00:58 +0000 |
| commit | d1e6c6059ef41cc913ae6c80bebde1fdf044e500 (patch) | |
| tree | fcf0310ea371e6c51a19bb06a8bb783ac8a30a7a /scumm | |
| parent | d16ac3e88f19dbfcad6937be2624f7983a906a5e (diff) | |
| download | scummvm-rg350-d1e6c6059ef41cc913ae6c80bebde1fdf044e500.tar.gz scummvm-rg350-d1e6c6059ef41cc913ae6c80bebde1fdf044e500.tar.bz2 scummvm-rg350-d1e6c6059ef41cc913ae6c80bebde1fdf044e500.zip | |
renamed global var _debugLevel to g_debugLevel; let Engine constructor init it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine
svn-id: r12134
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/debugger.cpp | 6 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 7823c43e0a..01d2e1ad81 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -35,7 +35,7 @@ #include "common/debugger.cpp" -extern uint16 _debugLevel; +extern uint16 g_debugLevel; namespace Scumm { @@ -524,10 +524,10 @@ bool ScummDebugger::Cmd_DebugLevel(int argc, const char **argv) { if (_vm->_debugMode == false) DebugPrintf("Debugging is not enabled at this time\n"); else - DebugPrintf("Debugging is currently set at level %d\n", _debugLevel); + DebugPrintf("Debugging is currently set at level %d\n", g_debugLevel); } else { // set level int level = atoi(argv[1]); - _debugLevel = level; + g_debugLevel = level; if (level > 0) { _vm->_debugMode = true; DebugPrintf("Debug level set to level %d\n", level); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index b33f1cf502..0e2c0bd501 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -68,8 +68,6 @@ extern bool isSmartphone(void); #endif -extern uint16 _debugLevel; - namespace Scumm { enum MouseButtonStatus { @@ -618,7 +616,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS // Read settings from the detector & config manager _debugMode = ConfMan.hasKey("debuglevel"); - _debugLevel = ConfMan.getInt("debuglevel"); _dumpScripts = detector->_dumpScripts; _bootParam = ConfMan.getInt("boot_param"); |