diff options
| author | Eugene Sandulenko | 2016-08-15 19:34:21 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-15 19:34:46 +0200 |
| commit | 21e82aef5f256e6d6daba9266c936569cf2e1eab (patch) | |
| tree | f675fdecbc201c72b12ff301794cb93eabb2cab8 | |
| parent | c92f1a665f010aec67cbf665f41bdb2ed8b78161 (diff) | |
| download | scummvm-rg350-21e82aef5f256e6d6daba9266c936569cf2e1eab.tar.gz scummvm-rg350-21e82aef5f256e6d6daba9266c936569cf2e1eab.tar.bz2 scummvm-rg350-21e82aef5f256e6d6daba9266c936569cf2e1eab.zip | |
DIRECTOR: Fix debug channels initialization
| -rw-r--r-- | engines/director/director.cpp | 4 | ||||
| -rw-r--r-- | engines/director/lingo/lingo.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp index 469aeb80cb..b787935f8e 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 9c52030976..96e6f868a2 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; |