[Scummvm-cvs-logs] scummvm master -> 21e82aef5f256e6d6daba9266c936569cf2e1eab
sev-
sev at scummvm.org
Mon Aug 15 19:34:56 CEST 2016
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
da99a44af5 FULLPIPE: Remove copy/paste leftover
56e180b292 DIRECTOR: Register debug channels
d15a895128 DIRECTOR: Lingo: Switch compilation debug to a channel
eabdc60567 DIRECTOR: Lingo: Fix mNew factory method calling
c92f1a665f DIRECTOR: Lingo: Added some debug output
21e82aef5f DIRECTOR: Fix debug channels initialization
Commit: da99a44af5204e68b86e954ab0f90bbbc25c2f36
https://github.com/scummvm/scummvm/commit/da99a44af5204e68b86e954ab0f90bbbc25c2f36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-15T19:34:46+02:00
Commit Message:
FULLPIPE: Remove copy/paste leftover
Changed paths:
engines/fullpipe/fullpipe.h
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index d9ab2aa..2012d7a 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -48,7 +48,7 @@ namespace Fullpipe {
enum FullpipeGameFeatures {
};
-enum AccessDebugChannels {
+enum {
kDebugPathfinding = 1 << 0,
kDebugDrawing = 1 << 1,
kDebugLoading = 1 << 2,
Commit: 56e180b292e9dc39a92e16ca3a06aca544427469
https://github.com/scummvm/scummvm/commit/56e180b292e9dc39a92e16ca3a06aca544427469
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-15T19:34:46+02:00
Commit Message:
DIRECTOR: Register debug channels
Changed paths:
engines/director/lingo/lingo.cpp
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index f3faf97..0ccf5a9 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -20,6 +20,7 @@
*
*/
+#include "common/debug-channels.h"
#include "common/str-array.h"
#include "director/lingo/lingo.h"
@@ -82,6 +83,9 @@ Symbol::Symbol() {
Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
g_lingo = this;
+ DebugMan.addDebugChannel(kDebugLingoExec, "lingoexec", "Lingo Execution");
+ DebugMan.addDebugChannel(kDebugLingoCompile, "lingocompile", "Lingo Compilation");
+
for (const EventHandlerType *t = &eventHanlerDescs[0]; t->handler != kEventNone; ++t)
_eventHandlerTypes[t->handler] = t->name;
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 8af20f2..33dd025 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -35,6 +35,11 @@
namespace Director {
+enum {
+ kDebugLingoExec = 1 << 0,
+ kDebugLingoCompile = 1 << 1
+};
+
enum LEvent {
kEventPrepareMovie,
kEventStartMovie,
Commit: d15a8951286dd745291a143fc29482c7f0e5b3c4
https://github.com/scummvm/scummvm/commit/d15a8951286dd745291a143fc29482c7f0e5b3c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-15T19:34:46+02:00
Commit Message:
DIRECTOR: Lingo: Switch compilation debug to a channel
Changed paths:
engines/director/lingo/lingo.cpp
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 0ccf5a9..9c52030 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -146,7 +146,7 @@ const char *Lingo::findNextDefinition(const char *s) {
}
void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
- debug(2, "Add code \"%s\" for type %d with id %d", code, type, id);
+ debugC(2, kDebugLingoCompile, "Add code \"%s\" for type %d with id %d", code, type, id);
if (_scripts[type].contains(id)) {
delete _scripts[type][id];
@@ -180,7 +180,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
else
_inFactory = false;
- debug(2, "Code chunk:\n#####\n%s#####", chunk.c_str());
+ debugC(2, kDebugLingoCompile, "Code chunk:\n#####\n%s#####", chunk.c_str());
parse(chunk.c_str());
@@ -191,7 +191,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
_hadError = true; // HACK: This is for preventing test execution
- debug(2, "Code chunk:\n#####\n%s#####", begin);
+ debugC(2, kDebugLingoCompile, "Code chunk:\n#####\n%s#####", begin);
parse(begin);
} else {
parse(code);
@@ -211,7 +211,7 @@ void Lingo::executeScript(ScriptType type, uint16 id) {
return;
}
- debug(2, "Executing script type: %d, id: %d", type, id);
+ debugC(2, kDebugLingoExec, "Executing script type: %d, id: %d", type, id);
_currentScript = _scripts[type][id];
_pc = 0;
Commit: eabdc605677da1aafe8194f3ce3b8eaba5d5c785
https://github.com/scummvm/scummvm/commit/eabdc605677da1aafe8194f3ce3b8eaba5d5c785
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-15T19:34:46+02:00
Commit Message:
DIRECTOR: Lingo: Fix mNew factory method calling
Changed paths:
engines/director/lingo/lingo-builtins.cpp
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index d3545a7..45bfdd9 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -722,8 +722,7 @@ void Lingo::factoryCall(Common::String &name, int nargs) {
call(s, nargs);
- if (method.u.s->compareToIgnoreCase("mNew")) {
- warning("Got mNew method");
+ if (!method.u.s->compareToIgnoreCase("mNew")) {
Datum d;
d.type = OBJECT;
Commit: c92f1a665f010aec67cbf665f41bdb2ed8b78161
https://github.com/scummvm/scummvm/commit/c92f1a665f010aec67cbf665f41bdb2ed8b78161
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-15T19:34:46+02:00
Commit Message:
DIRECTOR: Lingo: Added some debug output
Changed paths:
engines/director/lingo/lingo-builtins.cpp
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 45bfdd9..70092d8 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -720,7 +720,9 @@ void Lingo::factoryCall(Common::String &name, int nargs) {
s = name + "-" + *method.u.s;
+ debugC(3, kDebugLingoExec, "Stack size before call: %d", _stack.size());
call(s, nargs);
+ debugC(3, kDebugLingoExec, "Stack size after call: %d", _stack.size());
if (!method.u.s->compareToIgnoreCase("mNew")) {
Datum d;
Commit: 21e82aef5f256e6d6daba9266c936569cf2e1eab
https://github.com/scummvm/scummvm/commit/21e82aef5f256e6d6daba9266c936569cf2e1eab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-15T19:34:46+02:00
Commit Message:
DIRECTOR: Fix debug channels initialization
Changed paths:
engines/director/director.cpp
engines/director/lingo/lingo.cpp
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 469aeb8..b787935 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -24,6 +24,7 @@
#include "common/config-manager.h"
#include "common/debug.h"
+#include "common/debug-channels.h"
#include "common/scummsys.h"
#include "common/error.h"
#include "common/events.h"
@@ -49,6 +50,9 @@ namespace Director {
DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc),
_rnd("director") {
+ DebugMan.addDebugChannel(kDebugLingoExec, "lingoexec", "Lingo Execution");
+ DebugMan.addDebugChannel(kDebugLingoCompile, "lingocompile", "Lingo Compilation");
+
if (!_mixer->isReady())
error("Sound initialization failed");
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 9c52030..96e6f86 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "common/debug-channels.h"
#include "common/str-array.h"
#include "director/lingo/lingo.h"
@@ -83,9 +82,6 @@ Symbol::Symbol() {
Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
g_lingo = this;
- DebugMan.addDebugChannel(kDebugLingoExec, "lingoexec", "Lingo Execution");
- DebugMan.addDebugChannel(kDebugLingoCompile, "lingocompile", "Lingo Compilation");
-
for (const EventHandlerType *t = &eventHanlerDescs[0]; t->handler != kEventNone; ++t)
_eventHandlerTypes[t->handler] = t->name;
More information about the Scummvm-git-logs
mailing list