From 3f74a19d810ffe3f0f02a7f26c4c0fa179aa9b51 Mon Sep 17 00:00:00 2001 From: ysj1173886760 <1173886760@qq.com> Date: Sun, 16 May 2021 16:06:25 +0800 Subject: [PATCH] GOB: move debug channels to metaEngineDetection --- engines/gob/detection/detection.cpp | 21 +++++++++++++++++++++ engines/gob/gob.cpp | 13 ------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp index c74cce591e7..0c8b422fd3f 100644 --- a/engines/gob/detection/detection.cpp +++ b/engines/gob/detection/detection.cpp @@ -26,6 +26,23 @@ #include "gob/dataio.h" #include "gob/detection/detection.h" #include "gob/detection/tables.h" +#include "gob/gob.h" + +static const DebugChannelDef debugFlagList[] = { + {Gob::kDebugFuncOp, "FuncOpcodes", "Script FuncOpcodes debug level"}, + {Gob::kDebugDrawOp, "DrawOpcodes", "Script DrawOpcodes debug level"}, + {Gob::kDebugGobOp, "GoblinOpcodes", "Script GoblinOpcodes debug level"}, + {Gob::kDebugSound, "Sound", "Sound output debug level"}, + {Gob::kDebugExpression, "Expression", "Expression parser debug level"}, + {Gob::kDebugGameFlow, "Gameflow", "Gameflow debug level"}, + {Gob::kDebugFileIO, "FileIO", "File Input/Output debug level"}, + {Gob::kDebugSaveLoad, "SaveLoad", "Saving/Loading debug level"}, + {Gob::kDebugGraphics, "Graphics", "Graphics debug level"}, + {Gob::kDebugVideo, "Video", "IMD/VMD video debug level"}, + {Gob::kDebugHotspots, "Hotspots", "Hotspots debug level"}, + {Gob::kDebugDemo, "Demo", "Demo script debug level"}, + DEBUG_CHANNEL_END +}; class GobMetaEngineDetection : public AdvancedMetaEngineDetection { public: @@ -38,6 +55,10 @@ public: const char *getName() const override; const char *getOriginalCopyright() const override; + const DebugChannelDef *getDebugChannels() const override { + return debugFlagList; + } + ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override; private: diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index fc2426c173a..b13842f463a 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -116,19 +116,6 @@ 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;