diff options
author | Eugene Sandulenko | 2017-02-24 08:21:24 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-02-24 08:22:20 +0100 |
commit | a3a74c70120e1d855007c8e51aabd663bdb67e0c (patch) | |
tree | b8e4184ad78e329b017b32988db372fc735ee9fc | |
parent | 1de760be1c467c1e9e9e8dc95d63fb28c4c9a26d (diff) | |
download | scummvm-rg350-a3a74c70120e1d855007c8e51aabd663bdb67e0c.tar.gz scummvm-rg350-a3a74c70120e1d855007c8e51aabd663bdb67e0c.tar.bz2 scummvm-rg350-a3a74c70120e1d855007c8e51aabd663bdb67e0c.zip |
DIRECTOR: Lingo: Clarified compile and exec debug level messages
-rw-r--r-- | engines/director/lingo/lingo-code.cpp | 2 | ||||
-rw-r--r-- | engines/director/lingo/lingo-codegen.cpp | 2 | ||||
-rw-r--r-- | engines/director/lingo/lingo.cpp | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp index abd47b2dc7..3cc3d0d540 100644 --- a/engines/director/lingo/lingo-code.cpp +++ b/engines/director/lingo/lingo-code.cpp @@ -949,7 +949,7 @@ void Lingo::c_whencode() { g_lingo->_currentEntityId = entity; - if (debugChannelSet(3, kDebugLingoExec)) { + if (debugChannelSet(1, kDebugLingoExec)) { uint pc = start; while (pc <= end) { Common::String instr = g_lingo->decodeInstruction(pc, &pc); diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp index 7e029cb9c7..d69de85e9a 100644 --- a/engines/director/lingo/lingo-codegen.cpp +++ b/engines/director/lingo/lingo-codegen.cpp @@ -214,7 +214,7 @@ void Lingo::define(Common::String &name, int start, int nargs, Common::String *p if (prefix) name = *prefix + "-" + name; - debugC(3, kDebugLingoCompile, "define(\"%s\", %d, %d, %d)", name.c_str(), start, _currentScript->size() - 1, nargs); + debugC(1, kDebugLingoCompile, "define(\"%s\", %d, %d, %d)", name.c_str(), start, _currentScript->size() - 1, nargs); Symbol *sym = getHandler(name); if (sym == NULL) { // Create variable if it was not defined diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp index fc12b8d562..ffbbdab933 100644 --- a/engines/director/lingo/lingo.cpp +++ b/engines/director/lingo/lingo.cpp @@ -136,17 +136,17 @@ const char *Lingo::findNextDefinition(const char *s) { return NULL; if (!strncmp(res, "macro ", 6)) { - debugC(3, kDebugLingoCompile, "See macro"); + debugC(1, kDebugLingoCompile, "See macro"); return res; } if (!strncmp(res, "factory ", 8)) { - debugC(3, kDebugLingoCompile, "See factory"); + debugC(1, kDebugLingoCompile, "See factory"); return res; } if (!strncmp(res, "method ", 7)) { - debugC(3, kDebugLingoCompile, "See method"); + debugC(1, kDebugLingoCompile, "See method"); return res; } @@ -158,7 +158,7 @@ const char *Lingo::findNextDefinition(const char *s) { } void Lingo::addCode(const char *code, ScriptType type, uint16 id) { - debugC(2, kDebugLingoCompile, "Add code \"%s\" for type %s with id %d", code, scriptType2str(type), id); + debugC(1, kDebugLingoCompile, "Add code \"%s\" for type %s with id %d", code, scriptType2str(type), id); if (_scripts[type].contains(id)) { delete _scripts[type][id]; @@ -175,7 +175,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) { const char *begin, *end; if (!strncmp(code, "menu:", 5)) { - debugC(2, kDebugLingoCompile, "Parsing menu"); + debugC(1, kDebugLingoCompile, "Parsing menu"); parseMenu(code); return; @@ -200,7 +200,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) { else _inFactory = false; - debugC(2, kDebugLingoCompile, "Code chunk:\n#####\n%s#####", chunk.c_str()); + debugC(1, kDebugLingoCompile, "Code chunk:\n#####\n%s#####", chunk.c_str()); parse(chunk.c_str()); @@ -208,7 +208,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) { uint pc = 0; while (pc < _currentScript->size()) { Common::String instr = decodeInstruction(pc, &pc); - debugC(3, kDebugLingoCompile, "[%5d] %s", pc, instr.c_str()); + debugC(2, kDebugLingoCompile, "[%5d] %s", pc, instr.c_str()); } } @@ -219,7 +219,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) { _hadError = true; // HACK: This is for preventing test execution - debugC(2, kDebugLingoCompile, "Code chunk:\n#####\n%s#####", begin); + debugC(1, kDebugLingoCompile, "Code chunk:\n#####\n%s#####", begin); parse(begin); } else { parse(code); @@ -236,7 +236,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) { uint pc = 0; while (pc < _currentScript->size()) { Common::String instr = decodeInstruction(pc, &pc); - debugC(3, kDebugLingoCompile, "[%5d] %s", pc, instr.c_str()); + debugC(2, kDebugLingoCompile, "[%5d] %s", pc, instr.c_str()); } } } @@ -247,7 +247,7 @@ void Lingo::executeScript(ScriptType type, uint16 id) { return; } - debugC(2, kDebugLingoExec, "Executing script type: %s, id: %d", scriptType2str(type), id); + debugC(1, kDebugLingoExec, "Executing script type: %s, id: %d", scriptType2str(type), id); _currentScript = _scripts[type][id]; _pc = 0; @@ -306,7 +306,7 @@ void Lingo::processEvent(LEvent event, ScriptType st, int entityId) { } else if (_scripts[st].contains(entityId)) { executeScript(st, entityId); // D3 list of scripts. } else { - debugC(8, kDebugLingoExec, "STUB: processEvent(%s) for %d", _eventHandlerTypes[event], entityId); + debugC(3, kDebugLingoExec, "STUB: processEvent(%s) for %d", _eventHandlerTypes[event], entityId); } } |