aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-27 13:59:08 -0400
committerPaul Gilbert2016-08-27 13:59:08 -0400
commitf5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7 (patch)
tree771a8d2b3fddf96c17a1d81d42cb08dfba09d110 /engines/gob
parent873d555add9aaf5eb0d021518f5134142e2c2ff6 (diff)
parent5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a (diff)
downloadscummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.gz
scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.bz2
scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.zip
Merge branch 'master' into xeen
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/gob.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index dfbff33c63..605f1ed5b9 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -115,6 +115,19 @@ void PauseDialog::handleKeyDown(Common::KeyState state) {
GobEngine::GobEngine(OSystem *syst) : Engine(syst), _rnd("gob") {
+ DebugMan.addDebugChannel(kDebugFuncOp, "FuncOpcodes", "Script FuncOpcodes debug level");
+ DebugMan.addDebugChannel(kDebugDrawOp, "DrawOpcodes", "Script DrawOpcodes debug level");
+ DebugMan.addDebugChannel(kDebugGobOp, "GoblinOpcodes", "Script GoblinOpcodes debug level");
+ DebugMan.addDebugChannel(kDebugSound, "Sound", "Sound output debug level");
+ DebugMan.addDebugChannel(kDebugExpression, "Expression", "Expression parser debug level");
+ DebugMan.addDebugChannel(kDebugGameFlow, "Gameflow", "Gameflow debug level");
+ DebugMan.addDebugChannel(kDebugFileIO, "FileIO", "File Input/Output debug level");
+ DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Saving/Loading debug level");
+ DebugMan.addDebugChannel(kDebugGraphics, "Graphics", "Graphics debug level");
+ DebugMan.addDebugChannel(kDebugVideo, "Video", "IMD/VMD video debug level");
+ DebugMan.addDebugChannel(kDebugHotspots, "Hotspots", "Hotspots debug level");
+ DebugMan.addDebugChannel(kDebugDemo, "Demo", "Demo script debug level");
+
_sound = 0; _mult = 0; _game = 0;
_global = 0; _dataIO = 0; _goblin = 0;
_vidPlayer = 0; _init = 0; _inter = 0;
@@ -136,19 +149,6 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst), _rnd("gob") {
_copyProtection = ConfMan.getBool("copy_protection");
_console = new GobConsole(this);
-
- DebugMan.addDebugChannel(kDebugFuncOp, "FuncOpcodes", "Script FuncOpcodes debug level");
- DebugMan.addDebugChannel(kDebugDrawOp, "DrawOpcodes", "Script DrawOpcodes debug level");
- DebugMan.addDebugChannel(kDebugGobOp, "GoblinOpcodes", "Script GoblinOpcodes debug level");
- DebugMan.addDebugChannel(kDebugSound, "Sound", "Sound output debug level");
- DebugMan.addDebugChannel(kDebugExpression, "Expression", "Expression parser debug level");
- DebugMan.addDebugChannel(kDebugGameFlow, "Gameflow", "Gameflow debug level");
- DebugMan.addDebugChannel(kDebugFileIO, "FileIO", "File Input/Output debug level");
- DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Saving/Loading debug level");
- DebugMan.addDebugChannel(kDebugGraphics, "Graphics", "Graphics debug level");
- DebugMan.addDebugChannel(kDebugVideo, "Video", "IMD/VMD video debug level");
- DebugMan.addDebugChannel(kDebugHotspots, "Hotspots", "Hotspots debug level");
- DebugMan.addDebugChannel(kDebugDemo, "Demo", "Demo script debug level");
}
GobEngine::~GobEngine() {