From 460d69e8855f849e2200c49b198936b1201e0c91 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 27 Apr 2010 21:40:52 +0000 Subject: COMMON: Move DebugChannel stuff into a new DebugMan singleton svn-id: r48821 --- engines/sci/decompressor.cpp | 2 +- engines/sci/engine/kpathing.cpp | 8 +++---- engines/sci/engine/vm.cpp | 2 +- engines/sci/sci.cpp | 50 ++++++++++++++++++++--------------------- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'engines/sci') diff --git a/engines/sci/decompressor.cpp b/engines/sci/decompressor.cpp index 3d978eb94b..6ceb4c4f54 100644 --- a/engines/sci/decompressor.cpp +++ b/engines/sci/decompressor.cpp @@ -870,7 +870,7 @@ int DecompressorDCL::unpackDCL(byte* dest) { for (uint32 i = 0; i < copy_length; i++) putByte(dest[pos + i]); - if (Common::isDebugChannelEnabled(kDebugLevelDclInflate)) { + if (DebugMan.isDebugChannelEnabled(kDebugLevelDclInflate)) { for (uint32 i = 0; i < copy_length; i++) debugC(kDebugLevelDclInflate, "\33[32;31m%02x\33[37;37m ", dest[pos + i]); debugC(kDebugLevelDclInflate, "\n"); diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp index e2c9ef2444..9746bbada1 100644 --- a/engines/sci/engine/kpathing.cpp +++ b/engines/sci/engine/kpathing.cpp @@ -1351,7 +1351,7 @@ static reg_t output_path(PathfindingState *p, EngineState *s) { // Sentinel writePoint(arrayRef, offset, Common::Point(POLY_LAST_POINT, POLY_LAST_POINT)); - if (Common::isDebugChannelEnabled(kDebugLevelAvoidPath)) { + if (DebugMan.isDebugChannelEnabled(kDebugLevelAvoidPath)) { debug("\nReturning path:"); for (int i = 0; i < offset; i++) { Common::Point pt = read_point(s->_segMan, output, i); @@ -1407,7 +1407,7 @@ reg_t kAvoidPath(EngineState *s, int argc, reg_t *argv) { opt = argv[6].toUint16(); } - if (Common::isDebugChannelEnabled(kDebugLevelAvoidPath)) { + if (DebugMan.isDebugChannelEnabled(kDebugLevelAvoidPath)) { debug("[avoidpath] Pathfinding input:"); draw_point(s, start, 1, width, height); draw_point(s, end, 0, width, height); @@ -1578,7 +1578,7 @@ reg_t kIntersections(EngineState *s, int argc, reg_t *argv) { int32 pDestX = inpBuf[curIndex].toSint16() & 0x1ff; int32 pDestY = inpBuf[curIndex + 1].toSint16(); - if (Common::isDebugChannelEnabled(kDebugLevelAvoidPath)) { + if (DebugMan.isDebugChannelEnabled(kDebugLevelAvoidPath)) { draw_line(s, Common::Point(pSourceX, pSourceY), Common::Point(pDestX, pDestY), 2, 320, 190); debugN(-1, " (%i, %i)[%i]", pDestX, pDestY, curIndex); @@ -1657,7 +1657,7 @@ reg_t kIntersections(EngineState *s, int argc, reg_t *argv) { if (curIndex == doneIndex) { // End of polyline/polygon reached - if (Common::isDebugChannelEnabled(kDebugLevelAvoidPath)) { + if (DebugMan.isDebugChannelEnabled(kDebugLevelAvoidPath)) { debug(";"); debugN(-1, "Found %i intersections", outCount); diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 6934a6f481..d32b2babc5 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -1680,7 +1680,7 @@ static EngineState *_game_run(EngineState *&s) { EngineState *successor = NULL; int game_is_finished = 0; - if (Common::isDebugChannelEnabled(kDebugLevelOnStartup)) + if (DebugMan.isDebugChannelEnabled(kDebugLevelOnStartup)) g_sci->getSciDebugger()->attach(); do { diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 28bc003478..87f156bc67 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -69,30 +69,30 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc) _features = 0; // Set up the engine specific debug levels - Common::addDebugChannel(kDebugLevelError, "Error", "Script error debugging"); - Common::addDebugChannel(kDebugLevelNodes, "Lists", "Lists and nodes debugging"); - Common::addDebugChannel(kDebugLevelGraphics, "Graphics", "Graphics debugging"); - Common::addDebugChannel(kDebugLevelStrings, "Strings", "Strings debugging"); - Common::addDebugChannel(kDebugLevelMemory, "Memory", "Memory debugging"); - Common::addDebugChannel(kDebugLevelFuncCheck, "Func", "Function parameter debugging"); - Common::addDebugChannel(kDebugLevelBresen, "Bresenham", "Bresenham algorithms debugging"); - Common::addDebugChannel(kDebugLevelSound, "Sound", "Sound debugging"); - Common::addDebugChannel(kDebugLevelGfxDriver, "Gfxdriver", "Gfx driver debugging"); - Common::addDebugChannel(kDebugLevelBaseSetter, "Base", "Base Setter debugging"); - Common::addDebugChannel(kDebugLevelParser, "Parser", "Parser debugging"); - Common::addDebugChannel(kDebugLevelMenu, "Menu", "Menu handling debugging"); - Common::addDebugChannel(kDebugLevelSaid, "Said", "Said specs debugging"); - Common::addDebugChannel(kDebugLevelFile, "File", "File I/O debugging"); - Common::addDebugChannel(kDebugLevelTime, "Time", "Time debugging"); - Common::addDebugChannel(kDebugLevelRoom, "Room", "Room number debugging"); - Common::addDebugChannel(kDebugLevelAvoidPath, "Pathfinding", "Pathfinding debugging"); - Common::addDebugChannel(kDebugLevelDclInflate, "DCL", "DCL inflate debugging"); - Common::addDebugChannel(kDebugLevelVM, "VM", "VM debugging"); - Common::addDebugChannel(kDebugLevelScripts, "Scripts", "Notifies when scripts are unloaded"); - Common::addDebugChannel(kDebugLevelGC, "GC", "Garbage Collector debugging"); - Common::addDebugChannel(kDebugLevelSci0Pic, "Sci0Pic", "SCI0 pic drawing debugging"); - Common::addDebugChannel(kDebugLevelResMan, "ResMan", "Resource manager debugging"); - Common::addDebugChannel(kDebugLevelOnStartup, "OnStartup", "Enter debugger at start of game"); + DebugMan.addDebugChannel(kDebugLevelError, "Error", "Script error debugging"); + DebugMan.addDebugChannel(kDebugLevelNodes, "Lists", "Lists and nodes debugging"); + DebugMan.addDebugChannel(kDebugLevelGraphics, "Graphics", "Graphics debugging"); + DebugMan.addDebugChannel(kDebugLevelStrings, "Strings", "Strings debugging"); + DebugMan.addDebugChannel(kDebugLevelMemory, "Memory", "Memory debugging"); + DebugMan.addDebugChannel(kDebugLevelFuncCheck, "Func", "Function parameter debugging"); + DebugMan.addDebugChannel(kDebugLevelBresen, "Bresenham", "Bresenham algorithms debugging"); + DebugMan.addDebugChannel(kDebugLevelSound, "Sound", "Sound debugging"); + DebugMan.addDebugChannel(kDebugLevelGfxDriver, "Gfxdriver", "Gfx driver debugging"); + DebugMan.addDebugChannel(kDebugLevelBaseSetter, "Base", "Base Setter debugging"); + DebugMan.addDebugChannel(kDebugLevelParser, "Parser", "Parser debugging"); + DebugMan.addDebugChannel(kDebugLevelMenu, "Menu", "Menu handling debugging"); + DebugMan.addDebugChannel(kDebugLevelSaid, "Said", "Said specs debugging"); + DebugMan.addDebugChannel(kDebugLevelFile, "File", "File I/O debugging"); + DebugMan.addDebugChannel(kDebugLevelTime, "Time", "Time debugging"); + DebugMan.addDebugChannel(kDebugLevelRoom, "Room", "Room number debugging"); + DebugMan.addDebugChannel(kDebugLevelAvoidPath, "Pathfinding", "Pathfinding debugging"); + DebugMan.addDebugChannel(kDebugLevelDclInflate, "DCL", "DCL inflate debugging"); + DebugMan.addDebugChannel(kDebugLevelVM, "VM", "VM debugging"); + DebugMan.addDebugChannel(kDebugLevelScripts, "Scripts", "Notifies when scripts are unloaded"); + DebugMan.addDebugChannel(kDebugLevelGC, "GC", "Garbage Collector debugging"); + DebugMan.addDebugChannel(kDebugLevelSci0Pic, "Sci0Pic", "SCI0 pic drawing debugging"); + DebugMan.addDebugChannel(kDebugLevelResMan, "ResMan", "Resource manager debugging"); + DebugMan.addDebugChannel(kDebugLevelOnStartup, "OnStartup", "Enter debugger at start of game"); _gamestate = 0; @@ -112,7 +112,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc) SciEngine::~SciEngine() { // Remove all of our debug levels here - Common::clearAllDebugChannels(); + DebugMan.clearAllDebugChannels(); delete _audio; delete _kernel; -- cgit v1.2.3