diff options
author | Max Horn | 2004-12-25 19:04:18 +0000 |
---|---|---|
committer | Max Horn | 2004-12-25 19:04:18 +0000 |
commit | d6872dba6b6b4c4dafbd411bf4b0651b7d01edce (patch) | |
tree | 6ca2a72c16b2b298d89e708ddd049d2f9f352c17 /base | |
parent | 2941d595bd18d9a64e33b20658e007709db9afda (diff) | |
download | scummvm-rg350-d6872dba6b6b4c4dafbd411bf4b0651b7d01edce.tar.gz scummvm-rg350-d6872dba6b6b4c4dafbd411bf4b0651b7d01edce.tar.bz2 scummvm-rg350-d6872dba6b6b4c4dafbd411bf4b0651b7d01edce.zip |
Get rid of g_debugLevel (this fixes bug #1091142)
svn-id: r16318
Diffstat (limited to 'base')
-rw-r--r-- | base/engine.cpp | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/base/engine.cpp b/base/engine.cpp index 22b80e1153..39f1ac2c9a 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -32,8 +32,6 @@ /* 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; @@ -44,8 +42,6 @@ Engine::Engine(OSystem *syst) // Add default file directory File::addDefaultDirectory(_gameDataPath); - g_debugLevel = ConfMan.getInt("debuglevel"); - _saveFileMan = _system->getSavefileManager(); } @@ -162,16 +158,7 @@ void CDECL warning(const char *s, ...) { #endif } -void CDECL debug(int level, const char *s, ...) { - char buf[STRINGBUFLEN]; - va_list va; - - if (level > g_debugLevel) - return; - - va_start(va, s); - vsprintf(buf, s, va); - va_end(va); +static void debugHelper(const char *buf) { #ifndef _WIN32_WCE printf("%s\n", buf); #endif @@ -190,27 +177,29 @@ void CDECL debug(int level, const char *s, ...) { fflush(stdout); } -void CDECL debug(const char *s, ...) { +void CDECL debug(int level, const char *s, ...) { char buf[STRINGBUFLEN]; va_list va; + if (level > ConfMan.getInt("debuglevel")) + return; + va_start(va, s); vsprintf(buf, s, va); va_end(va); - printf("%s\n", buf); + + debugHelper(buf); +} -#if defined( USE_WINDBG ) - strcat(buf, "\n"); -#if defined( _WIN32_WCE ) - TCHAR buf_unicode[1024]; - MultiByteToWideChar(CP_ACP, 0, buf, strlen(buf) + 1, buf_unicode, sizeof(buf_unicode)); - OutputDebugString(buf_unicode); -#else - OutputDebugString(buf); -#endif -#endif +void CDECL debug(const char *s, ...) { + char buf[STRINGBUFLEN]; + va_list va; - fflush(stdout); + va_start(va, s); + vsprintf(buf, s, va); + va_end(va); + + debugHelper(buf); } void checkHeap() { |