diff options
| author | Max Horn | 2010-04-27 21:39:43 +0000 |
|---|---|---|
| committer | Max Horn | 2010-04-27 21:39:43 +0000 |
| commit | 445dccd59bc77e760e649bae982d78f0c3ca6b04 (patch) | |
| tree | bb1a6da885c7e8fca2c46cced36126eae5a2f2f7 /common | |
| parent | 8275b3e13b6eba5bd04bc6863c416555715fbea1 (diff) | |
| download | scummvm-rg350-445dccd59bc77e760e649bae982d78f0c3ca6b04.tar.gz scummvm-rg350-445dccd59bc77e760e649bae982d78f0c3ca6b04.tar.bz2 scummvm-rg350-445dccd59bc77e760e649bae982d78f0c3ca6b04.zip | |
cleanup
svn-id: r48820
Diffstat (limited to 'common')
| -rw-r--r-- | common/debug.cpp | 13 | ||||
| -rw-r--r-- | common/debug.h | 15 |
2 files changed, 5 insertions, 23 deletions
diff --git a/common/debug.cpp b/common/debug.cpp index 430083f3d8..86371f4091 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -123,19 +123,6 @@ bool isDebugChannelEnabled(uint32 channel) { return (gDebugChannelsEnabled & channel) != 0; } -bool isDebugChannelEnabled(const String &name) { - // Debug level 11 turns on all special debug level messages - if (gDebugLevel == 11) - return true; - - // Search for the debug level with the given name and check if it is enabled - DebugChannelMap::iterator i = gDebugChannels.find(name); - if (i != gDebugChannels.end()) - return i->_value.enabled; - else - return false; -} - static OutputFormatter s_debugOutputFormatter = 0; diff --git a/common/debug.h b/common/debug.h index f4fbb9ff1e..d1c89ebd9c 100644 --- a/common/debug.h +++ b/common/debug.h @@ -98,7 +98,7 @@ typedef List<DebugChannel> DebugChannelList; /** * Lists all engine specific debug channels. * - * @return returns a arry with all debug channels + * @return returns an array with all debug channels */ DebugChannelList listDebugChannels(); @@ -108,11 +108,6 @@ DebugChannelList listDebugChannels(); */ bool isDebugChannelEnabled(uint32 channel); -/** - * Test whether the given debug channel is enabled. - */ -bool isDebugChannelEnabled(const String &name); - /** * Set the output formatter used by debug() and related functions. @@ -145,7 +140,7 @@ void debug(const char *s, ...) GCC_PRINTF(1, 2); /** * Print a debug message to the text console (stdout), but only if - * the specified level does not exceed the value of gDebugLevel. + * the gDebugLevel equals at least the specified level. * As a rule of thumb, the more important the message, the lower the level. * Automatically appends a newline. */ @@ -153,7 +148,7 @@ void debug(int level, const char *s, ...) GCC_PRINTF(2, 3); /** * Print a debug message to the text console (stdout), but only if - * the specified level does not exceed the value of gDebugLevel. + * the gDebugLevel equals at least the specified level. * As a rule of thumb, the more important the message, the lower the level. * Does not append a newline. */ @@ -161,7 +156,7 @@ void debugN(int level, const char *s, ...) GCC_PRINTF(2, 3); /** * Print a debug message to the text console (stdout), but only if - * the specified level does not exceed the value of gDebugLevel AND + * the gDebugLevel equals at least the specified level AND * if the specified special debug level is active. * As a rule of thumb, the more important the message, the lower the level. * Automatically appends a newline. @@ -172,7 +167,7 @@ void debugC(int level, uint32 debugChannels, const char *s, ...) GCC_PRINTF(3, 4 /** * Print a debug message to the text console (stdout), but only if - * the specified level does not exceed the value of gDebugLevel AND + * the gDebugLevel equals at least the specified level AND * if the specified special debug level is active. * As a rule of thumb, the more important the message, the lower the level. * Does not append a newline automatically. |