diff options
Diffstat (limited to 'engines/agos/debugger.cpp')
-rw-r--r-- | engines/agos/debugger.cpp | 117 |
1 files changed, 47 insertions, 70 deletions
diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index 512137b685..7ad742c928 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -32,44 +32,21 @@ Debugger::Debugger(AGOSEngine *vm) : GUI::Debugger() { _vm = vm; - DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit)); - DCmd_Register("level", WRAP_METHOD(Debugger, Cmd_DebugLevel)); - DCmd_Register("music", WRAP_METHOD(Debugger, Cmd_PlayMusic)); - DCmd_Register("sound", WRAP_METHOD(Debugger, Cmd_PlaySound)); - DCmd_Register("voice", WRAP_METHOD(Debugger, Cmd_PlayVoice)); - DCmd_Register("bit", WRAP_METHOD(Debugger, Cmd_SetBit)); - DCmd_Register("bit2", WRAP_METHOD(Debugger, Cmd_SetBit2)); - DCmd_Register("bit3", WRAP_METHOD(Debugger, Cmd_SetBit3)); - DCmd_Register("var", WRAP_METHOD(Debugger, Cmd_SetVar)); - DCmd_Register("obj", WRAP_METHOD(Debugger, Cmd_SetObjectFlag)); - DCmd_Register("sub", WRAP_METHOD(Debugger, Cmd_StartSubroutine)); - DCmd_Register("dumpimage", WRAP_METHOD(Debugger, Cmd_dumpImage)); - DCmd_Register("dumpscript", WRAP_METHOD(Debugger, Cmd_dumpScript)); + registerCmd("continue", WRAP_METHOD(Debugger, cmdExit)); + registerCmd("music", WRAP_METHOD(Debugger, Cmd_PlayMusic)); + registerCmd("sound", WRAP_METHOD(Debugger, Cmd_PlaySound)); + registerCmd("voice", WRAP_METHOD(Debugger, Cmd_PlayVoice)); + registerCmd("bit", WRAP_METHOD(Debugger, Cmd_SetBit)); + registerCmd("bit2", WRAP_METHOD(Debugger, Cmd_SetBit2)); + registerCmd("bit3", WRAP_METHOD(Debugger, Cmd_SetBit3)); + registerCmd("var", WRAP_METHOD(Debugger, Cmd_SetVar)); + registerCmd("obj", WRAP_METHOD(Debugger, Cmd_SetObjectFlag)); + registerCmd("sub", WRAP_METHOD(Debugger, Cmd_StartSubroutine)); + registerCmd("dumpimage", WRAP_METHOD(Debugger, Cmd_dumpImage)); + registerCmd("dumpscript", WRAP_METHOD(Debugger, Cmd_dumpScript)); } - -bool Debugger::Cmd_DebugLevel(int argc, const char **argv) { - if (argc == 1) { - if (_vm->_debugMode == false) - DebugPrintf("Debugging is not enabled at this time\n"); - else - DebugPrintf("Debugging is currently set at level %d\n", gDebugLevel); - } else { // set level - gDebugLevel = atoi(argv[1]); - if (0 <= gDebugLevel && gDebugLevel < 11) { - _vm->_debugMode = true; - DebugPrintf("Debug level set to level %d\n", gDebugLevel); - } else if (gDebugLevel < 0) { - _vm->_debugMode = false; - DebugPrintf("Debugging is now disabled\n"); - } else - DebugPrintf("Not a valid debug level (0 - 10)\n"); - } - - return true; -} - bool Debugger::Cmd_PlayMusic(int argc, const char **argv) { if (argc > 1) { uint music = atoi(argv[1]); @@ -83,9 +60,9 @@ bool Debugger::Cmd_PlayMusic(int argc, const char **argv) { _vm->playMusic(music, 0); } } else - DebugPrintf("Music out of range (0 - %d)\n", _vm->_numMusic); + debugPrintf("Music out of range (0 - %d)\n", _vm->_numMusic); } else - DebugPrintf("Syntax: music <musicnum>\n"); + debugPrintf("Syntax: music <musicnum>\n"); return true; } @@ -96,9 +73,9 @@ bool Debugger::Cmd_PlaySound(int argc, const char **argv) { if (sound <= _vm->_numSFX) _vm->_sound->playEffects(sound); else - DebugPrintf("Sound out of range (0 - %d)\n", _vm->_numSFX); + debugPrintf("Sound out of range (0 - %d)\n", _vm->_numSFX); } else - DebugPrintf("Syntax: sound <soundnum>\n"); + debugPrintf("Syntax: sound <soundnum>\n"); return true; } @@ -109,9 +86,9 @@ bool Debugger::Cmd_PlayVoice(int argc, const char **argv) { if (voice <= _vm->_numSpeech) _vm->_sound->playVoice(voice); else - DebugPrintf("Voice out of range (0 - %d)\n", _vm->_numSpeech); + debugPrintf("Voice out of range (0 - %d)\n", _vm->_numSpeech); } else - DebugPrintf("Syntax: voice <voicenum>\n"); + debugPrintf("Syntax: voice <voicenum>\n"); return true; } @@ -123,15 +100,15 @@ bool Debugger::Cmd_SetBit(int argc, const char **argv) { value = atoi(argv[2]); if (value <= 1) { _vm->setBitFlag(bit, value != 0); - DebugPrintf("Set bit %d to %d\n", bit, value); + debugPrintf("Set bit %d to %d\n", bit, value); } else - DebugPrintf("Bit value out of range (0 - 1)\n"); + debugPrintf("Bit value out of range (0 - 1)\n"); } else if (argc > 1) { bit = atoi(argv[1]); value = _vm->getBitFlag(bit); - DebugPrintf("Bit %d is %d\n", bit, value); + debugPrintf("Bit %d is %d\n", bit, value); } else - DebugPrintf("Syntax: bit <bitnum> <value>\n"); + debugPrintf("Syntax: bit <bitnum> <value>\n"); return true; } @@ -143,18 +120,18 @@ bool Debugger::Cmd_SetBit2(int argc, const char **argv) { value = atoi(argv[2]); if (value == 0) { _vm->_bitArrayTwo[bit / 16] &= ~(1 << (bit & 15)); - DebugPrintf("Set bit2 %d to %d\n", bit, value); + debugPrintf("Set bit2 %d to %d\n", bit, value); } else if (value == 1) { _vm->_bitArrayTwo[bit / 16] |= (1 << (bit & 15)); - DebugPrintf("Set bit2 %d to %d\n", bit, value); + debugPrintf("Set bit2 %d to %d\n", bit, value); } else - DebugPrintf("Bit2 value out of range (0 - 1)\n"); + debugPrintf("Bit2 value out of range (0 - 1)\n"); } else if (argc > 1) { bit = atoi(argv[1]); value = (_vm->_bitArrayTwo[bit / 16] & (1 << (bit & 15))) != 0; - DebugPrintf("Bit2 %d is %d\n", bit, value); + debugPrintf("Bit2 %d is %d\n", bit, value); } else - DebugPrintf("Syntax: bit2 <bitnum> <value>\n"); + debugPrintf("Syntax: bit2 <bitnum> <value>\n"); return true; } @@ -166,18 +143,18 @@ bool Debugger::Cmd_SetBit3(int argc, const char **argv) { value = atoi(argv[2]); if (value == 0) { _vm->_bitArrayThree[bit / 16] &= ~(1 << (bit & 15)); - DebugPrintf("Set bit3 %d to %d\n", bit, value); + debugPrintf("Set bit3 %d to %d\n", bit, value); } else if (value == 1) { _vm->_bitArrayThree[bit / 16] |= (1 << (bit & 15)); - DebugPrintf("Set bit3 %d to %d\n", bit, value); + debugPrintf("Set bit3 %d to %d\n", bit, value); } else - DebugPrintf("Bit3 value out of range (0 - 1)\n"); + debugPrintf("Bit3 value out of range (0 - 1)\n"); } else if (argc > 1) { bit = atoi(argv[1]); value = (_vm->_bitArrayThree[bit / 16] & (1 << (bit & 15))) != 0; - DebugPrintf("Bit3 %d is %d\n", bit, value); + debugPrintf("Bit3 %d is %d\n", bit, value); } else - DebugPrintf("Syntax: bit3 <bitnum> <value>\n"); + debugPrintf("Syntax: bit3 <bitnum> <value>\n"); return true; } @@ -190,15 +167,15 @@ bool Debugger::Cmd_SetVar(int argc, const char **argv) { if (argc > 2) { value = atoi(argv[2]); _vm->writeVariable(var, value); - DebugPrintf("Set var %d to %d\n", var, value); + debugPrintf("Set var %d to %d\n", var, value); } else { value = _vm->readVariable(var); - DebugPrintf("Var %d is %d\n", var, value); + debugPrintf("Var %d is %d\n", var, value); } } else - DebugPrintf("Var out of range (0 - %d)\n", _vm->_numVars - 1); + debugPrintf("Var out of range (0 - %d)\n", _vm->_numVars - 1); } else - DebugPrintf("Syntax: var <varnum> <value>\n"); + debugPrintf("Syntax: var <varnum> <value>\n"); return true; } @@ -217,22 +194,22 @@ bool Debugger::Cmd_SetObjectFlag(int argc, const char **argv) { if (argc > 3) { value = atoi(argv[3]); o->objectFlagValue[offs] = value; - DebugPrintf("Object %d Flag %d set to %d\n", obj, prop, value); + debugPrintf("Object %d Flag %d set to %d\n", obj, prop, value); } else { value = o->objectFlagValue[offs]; - DebugPrintf("Object %d Flag %d is %d\n", obj, prop, value); + debugPrintf("Object %d Flag %d is %d\n", obj, prop, value); } } else { - DebugPrintf("Object flag out of range\n"); + debugPrintf("Object flag out of range\n"); } } else { - DebugPrintf("Item isn't an object\n"); + debugPrintf("Item isn't an object\n"); } } else { - DebugPrintf("Item out of range (1 - %d)\n", _vm->_itemArraySize - 1); + debugPrintf("Item out of range (1 - %d)\n", _vm->_itemArraySize - 1); } } else { - DebugPrintf("Syntax: obj <itemnum> <flag> <value>\n"); + debugPrintf("Syntax: obj <itemnum> <flag> <value>\n"); } return true; @@ -246,7 +223,7 @@ bool Debugger::Cmd_StartSubroutine(int argc, const char **argv) { if (sub != NULL) _vm->startSubroutine(sub); } else - DebugPrintf("Subroutine %d\n", _vm->_currentTable->id); + debugPrintf("Subroutine %d\n", _vm->_currentTable->id); return true; } @@ -259,11 +236,11 @@ bool Debugger::Cmd_dumpImage(int argc, const char **argv) { if (vpe->vgaFile2 != NULL) { _vm->dumpVgaBitmaps(zoneNum); } else { - DebugPrintf("Invalid Zone Number %d\n", zoneNum); + debugPrintf("Invalid Zone Number %d\n", zoneNum); } } else - DebugPrintf("Syntax: dumpimage <zonenum>\n"); + debugPrintf("Syntax: dumpimage <zonenum>\n"); return true; } @@ -276,11 +253,11 @@ bool Debugger::Cmd_dumpScript(int argc, const char **argv) { if (vpe->vgaFile1 != NULL) { _vm->dumpVgaFile(vpe->vgaFile1); } else { - DebugPrintf("Invalid Zone Number %d\n", zoneNum); + debugPrintf("Invalid Zone Number %d\n", zoneNum); } } else - DebugPrintf("Syntax: dumpscript <zonenum>\n"); + debugPrintf("Syntax: dumpscript <zonenum>\n"); return true; } |