aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/engine.cpp8
-rw-r--r--queen/queen.cpp4
-rw-r--r--scumm/debugger.cpp6
-rw-r--r--scumm/scummvm.cpp3
-rw-r--r--simon/simon.cpp12
-rw-r--r--sky/sky.cpp3
-rw-r--r--sword1/sword1.cpp6
-rw-r--r--sword1/sword1.h3
-rw-r--r--sword2/sword2.cpp3
9 files changed, 13 insertions, 35 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index e86b9af4ef..d6349c58b3 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -32,6 +32,8 @@
/* FIXME - BIG HACK for MidiEmu */
Engine *g_engine = 0;
+uint16 g_debugLevel = 0;
+
Engine::Engine(OSystem *syst)
: _system(syst), _gameDataPath(ConfMan.get("path")) {
g_engine = this;
@@ -41,6 +43,8 @@ Engine::Engine(OSystem *syst)
// Set default file directory
File::setDefaultDirectory(_gameDataPath);
+
+ g_debugLevel = ConfMan.getInt("debuglevel");
}
Engine::~Engine() {
@@ -158,8 +162,6 @@ void CDECL warning(const char *s, ...) {
#endif
}
-uint16 _debugLevel = 0;
-
void CDECL debug(int level, const char *s, ...) {
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
@@ -168,7 +170,7 @@ void CDECL debug(int level, const char *s, ...) {
#endif
va_list va;
- if (level > _debugLevel)
+ if (level > g_debugLevel)
return;
va_start(va, s);
diff --git a/queen/queen.cpp b/queen/queen.cpp
index c3d13f1f6f..cfce6ba62a 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -46,8 +46,6 @@
#include "sound/mididrv.h"
-extern uint16 _debugLevel;
-
#ifdef _WIN32_WCE
extern bool toolbar_drawn;
@@ -97,8 +95,6 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
_mixer->setVolume(ConfMan.getInt("sfx_volume"));
- _debugLevel = ConfMan.getInt("debuglevel");
-
_system->init_size(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
}
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");
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 7bdddc8066..af7558c6b4 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -51,7 +51,7 @@ extern bool toolbar_drawn;
extern bool draw_keyboard;
#endif
-extern uint16 _debugLevel;
+extern uint16 g_debugLevel;
struct SimonGameSettings {
const char *name;
@@ -344,7 +344,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
_dx_use_3_or_4_for_lock = 0;
_debugMode = 0;
- _debugLevel = 0;
_language = 0;
_pause = 0;
_start_mainscript = 0;
@@ -567,7 +566,6 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
midi.set_volume(ConfMan.getInt("music_volume"));
_debugMode = ConfMan.hasKey("debuglevel");
- _debugLevel = ConfMan.getInt("debuglevel");
_language = Common::parseLanguage(ConfMan.get("language"));
if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
@@ -4819,13 +4817,13 @@ void SimonEngine::go() {
_continous_vgascript = false;
_draw_images_debug=false;
- if (_debugLevel == 2)
+ if (g_debugLevel == 2)
_continous_mainscript = true;
- if (_debugLevel == 3)
+ if (g_debugLevel == 3)
_continous_vgascript = true;
- if (_debugLevel == 4)
+ if (g_debugLevel == 4)
_start_mainscript = true;
- if (_debugLevel == 5)
+ if (g_debugLevel == 5)
_start_vgascript = true;
if (_game & GF_TALKIE) {
diff --git a/sky/sky.cpp b/sky/sky.cpp
index e6b396f536..020881fca8 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -50,8 +50,6 @@
#include "sound/mididrv.h"
#include "sound/mixer.h"
-extern uint16 _debugLevel;
-
#ifdef _WIN32_WCE
extern bool toolbar_drawn;
@@ -124,7 +122,6 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
_mixer->setVolume(ConfMan.getInt("sfx_volume")); //unnecessary?
_debugMode = ConfMan.hasKey("debuglevel");
- _debugLevel = ConfMan.getInt("debuglevel");
_floppyIntro = ConfMan.getBool("floppy_intro");
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index eaf46f4369..d86cf1dc1e 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -82,15 +82,9 @@ void SwordEngine::errorString(const char *buf1, char *buf2) {
strcpy(buf2, buf1);
}
-extern uint16 _debugLevel;
-
SwordEngine::SwordEngine(GameDetector *detector, OSystem *syst)
: Engine(syst) {
- _detector = detector;
- _system = syst;
- _debugLevel = ConfMan.getInt("debuglevel");
-
if (!_mixer->isReady())
warning("Sound initialization failed");
}
diff --git a/sword1/sword1.h b/sword1/sword1.h
index aea5252d0f..6c400b4483 100644
--- a/sword1/sword1.h
+++ b/sword1/sword1.h
@@ -71,9 +71,6 @@ private:
uint16 _mouseX, _mouseY, _mouseState;
uint8 _keyPressed;
- GameDetector *_detector;
- OSystem *_system;
-
MemMan *_memMan;
ResMan *_resMan;
ObjectMan *_objectMan;
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 972bafef31..4c0340950c 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -29,8 +29,6 @@
extern bool isSmartphone(void);
#endif
-extern uint16 _debugLevel;
-
struct Sword2GameSettings {
const char *name;
const char *description;
@@ -104,7 +102,6 @@ Sword2Engine::Sword2Engine(GameDetector *detector, OSystem *syst)
_targetName = strdup(detector->_targetName.c_str());
_bootParam = ConfMan.getInt("boot_param");
_saveSlot = ConfMan.getInt("save_slot");
- _debugLevel = ConfMan.getInt("debuglevel");
// Setup mixer
if (!_mixer->isReady())
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 12:56:13 +0000