diff options
| author | D G Turner | 2014-05-11 13:17:16 +0100 |
|---|---|---|
| committer | D G Turner | 2014-05-11 13:17:16 +0100 |
| commit | 55d8a461774f24db3f6f9a428469ca11353707e5 (patch) | |
| tree | 739a5830f1dcd7252a8ae189f0d6601503b49902 /engines | |
| parent | 0c9390fb271bf49377443d9712a270ada4210249 (diff) | |
| download | scummvm-rg350-55d8a461774f24db3f6f9a428469ca11353707e5.tar.gz scummvm-rg350-55d8a461774f24db3f6f9a428469ca11353707e5.tar.bz2 scummvm-rg350-55d8a461774f24db3f6f9a428469ca11353707e5.zip | |
AGOS: Switch script debugging to debug flag, rather than level 4.
This is now set by --debugflags=script rather than -d 4, though
it will still require a debug level greater than 0.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/agos.cpp | 3 | ||||
| -rw-r--r-- | engines/agos/agos.h | 4 | ||||
| -rw-r--r-- | engines/agos/subroutine.cpp | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 809311219f..cf444bc84d 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -147,6 +147,7 @@ AGOSEngine::AGOSEngine(OSystem *system, const AGOSGameDescription *gd) DebugMan.addDebugChannel(kDebugOpcode, "opcode", "Opcode debug level"); DebugMan.addDebugChannel(kDebugVGAOpcode, "vga_opcode", "VGA Opcode debug level"); + DebugMan.addDebugChannel(kDebugScript, "script", "Script debug level"); _vcPtr = 0; _vcGetOutOfCode = 0; @@ -247,7 +248,6 @@ AGOSEngine::AGOSEngine(OSystem *system, const AGOSGameDescription *gd) _backFlag = false; - _dumpScripts = false; _dumpVgaScripts = false; _dumpImages = false; @@ -678,7 +678,6 @@ Common::Error AGOSEngine::init() { // TODO: Use special debug levels instead of the following hack. switch (gDebugLevel) { - case 4: _dumpScripts = true; break; case 5: _dumpVgaScripts = true; break; } diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 3eff6a889f..e1d7a54a75 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -63,7 +63,8 @@ namespace AGOS { enum { kDebugOpcode = 1 << 0, - kDebugVGAOpcode = 1 << 1 + kDebugVGAOpcode = 1 << 1, + kDebugScript = 1 << 2 }; uint fileReadItemID(Common::SeekableReadStream *in); @@ -332,7 +333,6 @@ protected: Common::Language _language; bool _copyProtection; bool _pause; - bool _dumpScripts; bool _dumpVgaScripts; bool _dumpImages; bool _speech; diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index a54a6c3b49..f7eec9caaa 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -20,8 +20,7 @@ * */ - - +#include "common/debug-channels.h" #include "common/file.h" #include "common/textconsole.h" @@ -531,7 +530,7 @@ int AGOSEngine::startSubroutine(Subroutine *sub) { _classMode1 = 0; _classMode2 = 0; - if (_dumpScripts) + if (DebugMan.isDebugChannelEnabled(kDebugScript)) dumpSubroutine(sub); if (++_recursionDepth > 40) |