diff options
| author | Max Horn | 2005-07-11 10:59:14 +0000 |
|---|---|---|
| committer | Max Horn | 2005-07-11 10:59:14 +0000 |
| commit | d1e7144a02c024fe7a948120821b426f4f1a77d1 (patch) | |
| tree | efe04a398164855086004a90c335233367f28798 | |
| parent | 71bc3a3ba631e99ca5a6f905f1c2973db5115b50 (diff) | |
| download | scummvm-rg350-d1e7144a02c024fe7a948120821b426f4f1a77d1.tar.gz scummvm-rg350-d1e7144a02c024fe7a948120821b426f4f1a77d1.tar.bz2 scummvm-rg350-d1e7144a02c024fe7a948120821b426f4f1a77d1.zip | |
Yet another GCC 4 fix
svn-id: r18535
| -rw-r--r-- | scumm/debugger.cpp | 14 | ||||
| -rw-r--r-- | scumm/scumm.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 45163bb74c..dce0db11f3 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -39,6 +39,20 @@ namespace Scumm { +// Debug channel lookup table for Debugger console +static const dbgChannelDesc debugChannels[] = { + {"SCRIPTS", "Track script execution", DEBUG_SCRIPTS}, + {"OPCODES", "Track opcode execution", DEBUG_OPCODES}, + {"IMUSE", "Track iMUSE events", DEBUG_IMUSE}, + {"RESOURCE", "Track resource loading/management", DEBUG_RESOURCE}, + {"VARS", "Track variable changes", DEBUG_VARS}, + {"ACTORS", "Actor-related debug", DEBUG_ACTORS}, + {"SOUND", "Sound related debug", DEBUG_SOUND}, + {"INSANE", "Track INSANE", DEBUG_INSANE}, + {"SMUSH", "Track SMUSH", DEBUG_SMUSH} +}; + + void CDECL debugC(int channel, const char *s, ...) { char buf[STRINGBUFLEN]; va_list va; diff --git a/scumm/scumm.h b/scumm/scumm.h index 7ebe07f297..f61d9b307d 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -157,20 +157,6 @@ enum { DEBUG_SMUSH = 1 << 10 // Track SMUSH }; - -// Debug channel lookup table for Debugger console -static const dbgChannelDesc debugChannels[] = { - {"SCRIPTS", "Track script execution", DEBUG_SCRIPTS}, - {"OPCODES", "Track opcode execution", DEBUG_OPCODES}, - {"IMUSE", "Track iMUSE events", DEBUG_IMUSE}, - {"RESOURCE", "Track resource loading/management", DEBUG_RESOURCE}, - {"VARS", "Track variable changes", DEBUG_VARS}, - {"ACTORS", "Actor-related debug", DEBUG_ACTORS}, - {"SOUND", "Sound related debug", DEBUG_SOUND}, - {"INSANE", "Track INSANE", DEBUG_INSANE}, - {"SMUSH", "Track SMUSH", DEBUG_SMUSH} -}; - struct MemBlkHeader { uint32 size; }; |