From daa8d57a866e2866369e432cf1d624179edc8875 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:07 +0200 Subject: ALL: Rename Debugger::DebugPrintf to Debugger::debugPrintf. --- engines/agi/console.cpp | 52 +- engines/agi/preagi_mickey.cpp | 4 +- engines/agi/preagi_winnie.cpp | 2 +- engines/agos/debugger.cpp | 70 +- engines/avalanche/console.cpp | 2 +- engines/cge/console.cpp | 2 +- engines/cruise/debugger.cpp | 4 +- engines/drascula/console.cpp | 2 +- engines/fullpipe/console.cpp | 4 +- engines/gob/cheater_geisha.cpp | 2 +- engines/gob/console.cpp | 32 +- engines/groovie/debug.cpp | 14 +- engines/hopkins/debugger.cpp | 10 +- engines/hugo/console.cpp | 22 +- engines/kyra/debugger.cpp | 204 ++--- engines/lastexpress/debug.cpp | 162 ++-- engines/lure/debugger.cpp | 176 ++--- engines/mads/debugger.cpp | 46 +- engines/mohawk/console.cpp | 156 ++-- engines/neverhood/console.cpp | 72 +- engines/neverhood/gamevars.cpp | 2 +- engines/neverhood/scene.cpp | 2 +- engines/parallaction/debug.cpp | 52 +- engines/pegasus/console.cpp | 12 +- engines/queen/debug.cpp | 54 +- engines/saga/actor_walk.cpp | 2 +- engines/saga/animation.cpp | 8 +- engines/saga/console.cpp | 40 +- engines/saga/objectmap.cpp | 2 +- engines/saga/scene.cpp | 2 +- engines/saga/sfuncs.cpp | 2 +- engines/sci/console.cpp | 1434 ++++++++++++++++++------------------ engines/sci/engine/kevent.cpp | 12 +- engines/sci/engine/scriptdebug.cpp | 16 +- engines/sci/graphics/animate.cpp | 2 +- engines/sci/graphics/frameout.cpp | 10 +- engines/sci/graphics/ports.cpp | 2 +- engines/sci/parser/grammar.cpp | 22 +- engines/sci/parser/vocabulary.cpp | 20 +- engines/sci/sound/music.cpp | 22 +- engines/scumm/debugger.cpp | 168 ++--- engines/sky/debug.cpp | 90 +-- engines/sword2/console.cpp | 186 ++--- engines/sword2/resman.cpp | 2 +- engines/sword2/sound.cpp | 2 +- engines/teenagent/console.cpp | 32 +- engines/tinsel/debugger.cpp | 32 +- engines/toltecs/console.cpp | 10 +- engines/tony/debugger.cpp | 6 +- engines/touche/console.cpp | 2 +- engines/tsage/debugger.cpp | 362 ++++----- engines/voyeur/debugger.cpp | 36 +- engines/wintermute/debugger.cpp | 6 +- engines/zvision/core/console.cpp | 24 +- 54 files changed, 1857 insertions(+), 1857 deletions(-) (limited to 'engines') diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp index 5f222adf89..dce85b931c 100644 --- a/engines/agi/console.cpp +++ b/engines/agi/console.cpp @@ -52,7 +52,7 @@ Console::Console(AgiEngine *vm) : GUI::Debugger() { bool Console::Cmd_SetVar(int argc, const char **argv) { if (argc != 3) { - DebugPrintf("Usage: setvar \n"); + debugPrintf("Usage: setvar \n"); return true; } int p1 = (int)atoi(argv[1]); @@ -64,7 +64,7 @@ bool Console::Cmd_SetVar(int argc, const char **argv) { bool Console::Cmd_SetFlag(int argc, const char **argv) { if (argc != 3) { - DebugPrintf("Usage: setvar \n"); + debugPrintf("Usage: setvar \n"); return true; } int p1 = (int)atoi(argv[1]); @@ -76,7 +76,7 @@ bool Console::Cmd_SetFlag(int argc, const char **argv) { bool Console::Cmd_SetObj(int argc, const char **argv) { if (argc != 3) { - DebugPrintf("Usage: setvar \n"); + debugPrintf("Usage: setvar \n"); return true; } int p1 = (int)atoi(argv[1]); @@ -88,7 +88,7 @@ bool Console::Cmd_SetObj(int argc, const char **argv) { bool Console::Cmd_RunOpcode(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: runopcode ....\n"); + debugPrintf("Usage: runopcode ....\n"); return true; } @@ -96,7 +96,7 @@ bool Console::Cmd_RunOpcode(int argc, const char **argv) { if (!strcmp(argv[1], logicNamesCmd[i].name)) { uint8 p[16]; if ((argc - 2) != logicNamesCmd[i].argumentsLength()) { - DebugPrintf("AGI command wants %d arguments\n", logicNamesCmd[i].argumentsLength()); + debugPrintf("AGI command wants %d arguments\n", logicNamesCmd[i].argumentsLength()); return 0; } p[0] = argv[2] ? (char)strtoul(argv[2], NULL, 0) : 0; @@ -113,7 +113,7 @@ bool Console::Cmd_RunOpcode(int argc, const char **argv) { } } - DebugPrintf("Unknown opcode\n"); + debugPrintf("Unknown opcode\n"); return true; } @@ -125,7 +125,7 @@ bool Console::Cmd_Agiver(int argc, const char **argv) { maj = (ver >> 12) & 0xf; min = ver & 0xfff; - DebugPrintf(maj <= 2 ? "%x.%03x\n" : "%x.002.%03x\n", maj, min); + debugPrintf(maj <= 2 ? "%x.%03x\n" : "%x.002.%03x\n", maj, min); return true; } @@ -133,17 +133,17 @@ bool Console::Cmd_Agiver(int argc, const char **argv) { bool Console::Cmd_Flags(int argc, const char **argv) { int i, j; - DebugPrintf(" "); + debugPrintf(" "); for (j = 0; j < 10; j++) - DebugPrintf("%d ", j); - DebugPrintf("\n"); + debugPrintf("%d ", j); + debugPrintf("\n"); for (i = 0; i < 255;) { - DebugPrintf("%3d ", i); + debugPrintf("%3d ", i); for (j = 0; j < 10; j++, i++) { - DebugPrintf("%c ", _vm->getflag(i) ? 'T' : 'F'); + debugPrintf("%c ", _vm->getflag(i) ? 'T' : 'F'); } - DebugPrintf("\n"); + debugPrintf("\n"); } return true; @@ -154,9 +154,9 @@ bool Console::Cmd_Vars(int argc, const char **argv) { for (i = 0; i < 255;) { for (j = 0; j < 5; j++, i++) { - DebugPrintf("%03d:%3d ", i, _vm->getvar(i)); + debugPrintf("%03d:%3d ", i, _vm->getvar(i)); } - DebugPrintf("\n"); + debugPrintf("\n"); } return true; @@ -166,7 +166,7 @@ bool Console::Cmd_Objs(int argc, const char **argv) { unsigned int i; for (i = 0; i < _vm->_game.numObjects; i++) { - DebugPrintf("%3d]%-24s(%3d)\n", i, _vm->objectName(i), _vm->objectGetLocation(i)); + debugPrintf("%3d]%-24s(%3d)\n", i, _vm->objectName(i), _vm->objectGetLocation(i)); } return true; @@ -174,7 +174,7 @@ bool Console::Cmd_Objs(int argc, const char **argv) { bool Console::Cmd_Opcode(int argc, const char **argv) { if (argc != 2 || (strcmp(argv[1], "on") && strcmp(argv[1], "off"))) { - DebugPrintf("Usage: opcode on|off\n"); + debugPrintf("Usage: opcode on|off\n"); return true; } @@ -185,7 +185,7 @@ bool Console::Cmd_Opcode(int argc, const char **argv) { bool Console::Cmd_Logic0(int argc, const char **argv) { if (argc != 2 || (strcmp(argv[1], "on") && strcmp(argv[1], "off"))) { - DebugPrintf("Usage: logic0 on|off\n"); + debugPrintf("Usage: logic0 on|off\n"); return true; } @@ -196,7 +196,7 @@ bool Console::Cmd_Logic0(int argc, const char **argv) { bool Console::Cmd_Trigger(int argc, const char **argv) { if (argc != 2 || (strcmp(argv[1], "on") && strcmp(argv[1], "off"))) { - DebugPrintf("Usage: trigger on|off\n"); + debugPrintf("Usage: trigger on|off\n"); return true; } _vm->_debug.ignoretriggers = strcmp (argv[1], "on"); @@ -236,13 +236,13 @@ bool Console::Cmd_Room(int argc, const char **argv) { _vm->newRoom(strtoul(argv[1], NULL, 0)); } - DebugPrintf("Current room: %d\n", _vm->getvar(0)); + debugPrintf("Current room: %d\n", _vm->getvar(0)); return true; } bool Console::Cmd_BT(int argc, const char **argv) { - DebugPrintf("Current script: %d\nStack depth: %d\n", _vm->_game.lognum, _vm->_game.execStack.size()); + debugPrintf("Current script: %d\nStack depth: %d\n", _vm->_game.lognum, _vm->_game.execStack.size()); uint8 *code = NULL; uint8 op = 0; @@ -257,12 +257,12 @@ bool Console::Cmd_BT(int argc, const char **argv) { memmove(p, &code[it->curIP], num); memset(p + num, 0, CMD_BSIZE - num); - DebugPrintf("%d(%d): %s(", it->script, it->curIP, logicNamesCmd[op].name); + debugPrintf("%d(%d): %s(", it->script, it->curIP, logicNamesCmd[op].name); for (int i = 0; i < num; i++) - DebugPrintf("%d, ", p[i]); + debugPrintf("%d, ", p[i]); - DebugPrintf(")\n"); + debugPrintf(")\n"); } return true; @@ -287,7 +287,7 @@ bool MickeyConsole::Cmd_Room(int argc, const char **argv) { bool MickeyConsole::Cmd_DrawPic(int argc, const char **argv) { if (argc != 2) - DebugPrintf("Usage: %s \n", argv[0]); + debugPrintf("Usage: %s \n", argv[0]); else _mickey->drawPic(atoi(argv[1])); return true; @@ -295,7 +295,7 @@ bool MickeyConsole::Cmd_DrawPic(int argc, const char **argv) { bool MickeyConsole::Cmd_DrawObj(int argc, const char **argv) { if (argc != 2) - DebugPrintf("Usage: %s \n", argv[0]); + debugPrintf("Usage: %s \n", argv[0]); else _mickey->drawObj((ENUM_MSA_OBJECT)atoi(argv[1]), 0, 0); return true; diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 561b56d199..4ca8d00824 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -2228,10 +2228,10 @@ void MickeyEngine::waitAnyKey(bool anim) { // Console-related functions void MickeyEngine::debugCurRoom() { - _console->DebugPrintf("Current Room = %d\n", _gameStateMickey.iRoom); + _console->debugPrintf("Current Room = %d\n", _gameStateMickey.iRoom); if (_gameStateMickey.iRmObj[_gameStateMickey.iRoom] != IDI_MSA_OBJECT_NONE) { - _console->DebugPrintf("Object %d is in the room\n", _gameStateMickey.iRmObj[_gameStateMickey.iRoom]); + _console->debugPrintf("Object %d is in the room\n", _gameStateMickey.iRmObj[_gameStateMickey.iRoom]); } } diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp index d5ae0b59a0..a91ad24fc6 100644 --- a/engines/agi/preagi_winnie.cpp +++ b/engines/agi/preagi_winnie.cpp @@ -1308,7 +1308,7 @@ void WinnieEngine::printStrWinnie(char *szMsg) { // Console-related functions void WinnieEngine::debugCurRoom() { - _console->DebugPrintf("Current Room = %d\n", _room); + _console->debugPrintf("Current Room = %d\n", _room); } WinnieEngine::WinnieEngine(OSystem *syst, const AGIGameDescription *gameDesc) : PreAgiEngine(syst, gameDesc) { diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index b5233bed0c..99ea8a15b7 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -60,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 \n"); + debugPrintf("Syntax: music \n"); return true; } @@ -73,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 \n"); + debugPrintf("Syntax: sound \n"); return true; } @@ -86,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 \n"); + debugPrintf("Syntax: voice \n"); return true; } @@ -100,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 \n"); + debugPrintf("Syntax: bit \n"); return true; } @@ -120,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 \n"); + debugPrintf("Syntax: bit2 \n"); return true; } @@ -143,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 \n"); + debugPrintf("Syntax: bit3 \n"); return true; } @@ -167,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 \n"); + debugPrintf("Syntax: var \n"); return true; } @@ -194,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 \n"); + debugPrintf("Syntax: obj \n"); } return true; @@ -223,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; } @@ -236,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 \n"); + debugPrintf("Syntax: dumpimage \n"); return true; } @@ -253,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 \n"); + debugPrintf("Syntax: dumpscript \n"); return true; } diff --git a/engines/avalanche/console.cpp b/engines/avalanche/console.cpp index 29ae5cf9c3..639ad63491 100644 --- a/engines/avalanche/console.cpp +++ b/engines/avalanche/console.cpp @@ -42,7 +42,7 @@ AvalancheConsole::~AvalancheConsole() { */ bool AvalancheConsole::Cmd_MagicLines(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: %s\n", argv[0]); + debugPrintf("Usage: %s\n", argv[0]); return true; } diff --git a/engines/cge/console.cpp b/engines/cge/console.cpp index 447875c06f..3d281df3ef 100644 --- a/engines/cge/console.cpp +++ b/engines/cge/console.cpp @@ -37,7 +37,7 @@ CGEConsole::~CGEConsole() { */ bool CGEConsole::Cmd_boundaries(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: %s\n", argv[0]); + debugPrintf("Usage: %s\n", argv[0]); return true; } diff --git a/engines/cruise/debugger.cpp b/engines/cruise/debugger.cpp index 4ef66ee11e..0bda44d0df 100644 --- a/engines/cruise/debugger.cpp +++ b/engines/cruise/debugger.cpp @@ -70,7 +70,7 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) { if (*pObjectName) { getMultipleObjectParam(currentObject->overlay, currentObject->idx, ¶ms); - DebugPrintf("%s %s - %d,%d\n", pObjectName, pObjType, params.X, params.Y); + debugPrintf("%s %s - %d,%d\n", pObjectName, pObjType, params.X, params.Y); } } @@ -96,7 +96,7 @@ bool Debugger::cmd_items(int argc, const char **argv) { getSingleObjectParam(i, j, 5, &returnVar); if (returnVar < -1) - DebugPrintf("%s\n", getObjectName(j, pOvlData->arrayNameObj)); + debugPrintf("%s\n", getObjectName(j, pOvlData->arrayNameObj)); } } } diff --git a/engines/drascula/console.cpp b/engines/drascula/console.cpp index 50e96c8757..4c14fb74fb 100644 --- a/engines/drascula/console.cpp +++ b/engines/drascula/console.cpp @@ -35,7 +35,7 @@ Console::~Console() { bool Console::Cmd_Room(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: room \n"); + debugPrintf("Usage: room \n"); return true; } diff --git a/engines/fullpipe/console.cpp b/engines/fullpipe/console.cpp index cb76345d66..3ff84dae5f 100644 --- a/engines/fullpipe/console.cpp +++ b/engines/fullpipe/console.cpp @@ -34,8 +34,8 @@ Console::Console(FullpipeEngine *vm) : GUI::Debugger(), _vm(vm) { bool Console::Cmd_Scene(int argc, const char **argv) { if (argc != 2) { int sceneTag = _vm->_currentScene->_sceneId; - DebugPrintf("Current scene: %d (scene tag: %d)\n", _vm->getSceneFromTag(sceneTag), sceneTag); - DebugPrintf("Use %s to change the current scene\n", argv[0]); + debugPrintf("Current scene: %d (scene tag: %d)\n", _vm->getSceneFromTag(sceneTag), sceneTag); + debugPrintf("Use %s to change the current scene\n", argv[0]); return true; } else { int scene = _vm->convertScene(atoi(argv[1])); diff --git a/engines/gob/cheater_geisha.cpp b/engines/gob/cheater_geisha.cpp index 8c4deec370..ec6fe09d59 100644 --- a/engines/gob/cheater_geisha.cpp +++ b/engines/gob/cheater_geisha.cpp @@ -61,7 +61,7 @@ bool Cheater_Geisha::cheat(GUI::Debugger &console) { uint32 digit5 = READ_VARO_UINT32(0x778); if (digit1 && digit2 && digit3 && digit4 && digit5) - console.DebugPrintf("Mastermind solution: %d %d %d %d %d\n", + console.debugPrintf("Mastermind solution: %d %d %d %d %d\n", digit1, digit2, digit3, digit4, digit5); return true; diff --git a/engines/gob/console.cpp b/engines/gob/console.cpp index b0f6006284..303c59c4da 100644 --- a/engines/gob/console.cpp +++ b/engines/gob/console.cpp @@ -51,7 +51,7 @@ void GobConsole::unregisterCheater() { } bool GobConsole::cmd_varSize(int argc, const char **argv) { - DebugPrintf("Size of the variable space: %d bytes\n", _vm->_inter->_variables->getSize()); + debugPrintf("Size of the variable space: %d bytes\n", _vm->_inter->_variables->getSize()); return true; } @@ -74,14 +74,14 @@ bool GobConsole::cmd_dumpVars(int argc, const char **argv) { bool GobConsole::cmd_var8(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: var8 ()\n"); + debugPrintf("Usage: var8 ()\n"); return true; } uint32 varNum = atoi(argv[1]); if (varNum >= _vm->_inter->_variables->getSize()) { - DebugPrintf("Variable offset out of range\n"); + debugPrintf("Variable offset out of range\n"); return true; } @@ -90,21 +90,21 @@ bool GobConsole::cmd_var8(int argc, const char **argv) { _vm->_inter->_variables->writeOff8(varNum, varVal); } - DebugPrintf("var8_%d = %d\n", varNum, _vm->_inter->_variables->readOff8(varNum)); + debugPrintf("var8_%d = %d\n", varNum, _vm->_inter->_variables->readOff8(varNum)); return true; } bool GobConsole::cmd_var16(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: var16 ()\n"); + debugPrintf("Usage: var16 ()\n"); return true; } uint32 varNum = atoi(argv[1]); if ((varNum + 1) >= _vm->_inter->_variables->getSize()) { - DebugPrintf("Variable offset out of range\n"); + debugPrintf("Variable offset out of range\n"); return true; } @@ -113,21 +113,21 @@ bool GobConsole::cmd_var16(int argc, const char **argv) { _vm->_inter->_variables->writeOff16(varNum, varVal); } - DebugPrintf("var16_%d = %d\n", varNum, _vm->_inter->_variables->readOff16(varNum)); + debugPrintf("var16_%d = %d\n", varNum, _vm->_inter->_variables->readOff16(varNum)); return true; } bool GobConsole::cmd_var32(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: var32 ()\n"); + debugPrintf("Usage: var32 ()\n"); return true; } uint32 varNum = atoi(argv[1]); if ((varNum + 3) >= _vm->_inter->_variables->getSize()) { - DebugPrintf("Variable offset out of range\n"); + debugPrintf("Variable offset out of range\n"); return true; } @@ -136,21 +136,21 @@ bool GobConsole::cmd_var32(int argc, const char **argv) { _vm->_inter->_variables->writeOff32(varNum, varVal); } - DebugPrintf("var8_%d = %d\n", varNum, _vm->_inter->_variables->readOff32(varNum)); + debugPrintf("var8_%d = %d\n", varNum, _vm->_inter->_variables->readOff32(varNum)); return true; } bool GobConsole::cmd_varString(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: varString ()\n"); + debugPrintf("Usage: varString ()\n"); return true; } uint32 varNum = atoi(argv[1]); if (varNum >= _vm->_inter->_variables->getSize()) { - DebugPrintf("Variable offset out of range\n"); + debugPrintf("Variable offset out of range\n"); return true; } @@ -160,7 +160,7 @@ bool GobConsole::cmd_varString(int argc, const char **argv) { Common::strlcpy(_vm->_inter->_variables->getAddressOffString(varNum), argv[2], maxLength); } - DebugPrintf("varString_%d = \"%s\"\n", varNum, _vm->_inter->_variables->getAddressOffString(varNum)); + debugPrintf("varString_%d = \"%s\"\n", varNum, _vm->_inter->_variables->getAddressOffString(varNum)); return true; } @@ -177,11 +177,11 @@ bool GobConsole::cmd_listArchives(int argc, const char **argv) { _vm->_dataIO->getArchiveInfo(info); - DebugPrintf(" Archive | Base | FileCount\n"); - DebugPrintf("--------------------------------\n"); + debugPrintf(" Archive | Base | FileCount\n"); + debugPrintf("--------------------------------\n"); for (Common::Array::const_iterator it = info.begin(); it != info.end(); ++it) if (!it->name.empty()) - DebugPrintf("%13s | %d | %d\n", it->name.c_str(), it->base, it->fileCount); + debugPrintf("%13s | %d | %d\n", it->name.c_str(), it->base, it->fileCount); return true; } diff --git a/engines/groovie/debug.cpp b/engines/groovie/debug.cpp index 8103e4f4c6..85b9b87652 100644 --- a/engines/groovie/debug.cpp +++ b/engines/groovie/debug.cpp @@ -81,7 +81,7 @@ bool Debugger::cmd_pc(int argc, const char **argv) { int val = getNumber(argv[1]); _script->_currentInstruction = val; } - DebugPrintf("pc = 0x%04X (%d)\n", _script->_currentInstruction, _script->_currentInstruction); + debugPrintf("pc = 0x%04X (%d)\n", _script->_currentInstruction, _script->_currentInstruction); return true; } @@ -97,9 +97,9 @@ bool Debugger::cmd_mem(int argc, const char **argv) { // Get val = _script->_variables[pos]; } - DebugPrintf("mem[0x%04X] = 0x%02X\n", pos, val); + debugPrintf("mem[0x%04X] = 0x%02X\n", pos, val); } else { - DebugPrintf("Syntax: mem []\n"); + debugPrintf("Syntax: mem []\n"); } return true; } @@ -109,7 +109,7 @@ bool Debugger::cmd_loadgame(int argc, const char **argv) { int slot = getNumber(argv[1]); _script->loadgame(slot); } else { - DebugPrintf("Syntax: load \n"); + debugPrintf("Syntax: load \n"); } return true; } @@ -119,7 +119,7 @@ bool Debugger::cmd_savegame(int argc, const char **argv) { int slot = getNumber(argv[1]); _script->savegame(slot); } else { - DebugPrintf("Syntax: save \n"); + debugPrintf("Syntax: save \n"); } return true; } @@ -129,7 +129,7 @@ bool Debugger::cmd_playref(int argc, const char **argv) { int ref = getNumber(argv[1]); _script->playvideofromref(ref); } else { - DebugPrintf("Syntax: playref \n"); + debugPrintf("Syntax: playref \n"); } return true; } @@ -140,7 +140,7 @@ bool Debugger::cmd_dumppal(int argc, const char **argv) { _vm->_system->getPaletteManager()->grabPalette(palettedump, 0, 256); for (i = 0; i < 256; i++) { - DebugPrintf("%3d: %3d,%3d,%3d\n", i, palettedump[(i * 3)], palettedump[(i * 3) + 1], palettedump[(i * 3) + 2]); + debugPrintf("%3d: %3d,%3d,%3d\n", i, palettedump[(i * 3)], palettedump[(i * 3) + 1], palettedump[(i * 3) + 2]); } return true; } diff --git a/engines/hopkins/debugger.cpp b/engines/hopkins/debugger.cpp index 14b1c183a8..e5c19847fb 100644 --- a/engines/hopkins/debugger.cpp +++ b/engines/hopkins/debugger.cpp @@ -41,7 +41,7 @@ Debugger::Debugger(HopkinsEngine *vm) : GUI::Debugger() { // Turns dirty rects on or off bool Debugger::cmd_DirtyRects(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("%s: [on | off]\n", argv[0]); + debugPrintf("%s: [on | off]\n", argv[0]); return true; } else { _vm->_graphicsMan->_showDirtyRects = !strcmp(argv[1], "on"); @@ -52,7 +52,7 @@ bool Debugger::cmd_DirtyRects(int argc, const char **argv) { // Change room number bool Debugger::cmd_Teleport(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("%s: [Room number]\n", argv[0]); + debugPrintf("%s: [Room number]\n", argv[0]); return true; } else { _vm->_globals->_exitId = atoi(argv[1]); @@ -62,13 +62,13 @@ bool Debugger::cmd_Teleport(int argc, const char **argv) { // Display room number bool Debugger::cmd_ShowCurrentRoom(int argc, const char **argv) { - DebugPrintf("Current room: %d\n", _vm->_globals->_curRoomNum); + debugPrintf("Current room: %d\n", _vm->_globals->_curRoomNum); return true; } bool Debugger::cmd_Zones(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("%s: [on | off]\n", argv[0]); + debugPrintf("%s: [on | off]\n", argv[0]); return true; } else { _vm->_graphicsMan->_showZones = !strcmp(argv[1], "on"); @@ -78,7 +78,7 @@ if (argc != 2) { bool Debugger::cmd_Lines(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("%s: [on | off]\n", argv[0]); + debugPrintf("%s: [on | off]\n", argv[0]); return true; } else { _vm->_graphicsMan->_showLines = !strcmp(argv[1], "on"); diff --git a/engines/hugo/console.cpp b/engines/hugo/console.cpp index 56025bfbfd..529fa4f7bd 100644 --- a/engines/hugo/console.cpp +++ b/engines/hugo/console.cpp @@ -62,7 +62,7 @@ static int strToInt(const char *s) { */ bool HugoConsole::Cmd_gotoScreen(int argc, const char **argv) { if ((argc != 2) || (strToInt(argv[1]) > _vm->_numScreens)){ - DebugPrintf("Usage: %s \n", argv[0]); + debugPrintf("Usage: %s \n", argv[0]); return true; } @@ -75,13 +75,13 @@ bool HugoConsole::Cmd_gotoScreen(int argc, const char **argv) { */ bool HugoConsole::Cmd_listScreens(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: %s\n", argv[0]); + debugPrintf("Usage: %s\n", argv[0]); return true; } - DebugPrintf("Available screens for this game are:\n"); + debugPrintf("Available screens for this game are:\n"); for (int i = 0; i < _vm->_numScreens; i++) - DebugPrintf("%2d - %s\n", i, _vm->_text->getScreenNames(i)); + debugPrintf("%2d - %s\n", i, _vm->_text->getScreenNames(i)); return true; } @@ -90,14 +90,14 @@ bool HugoConsole::Cmd_listScreens(int argc, const char **argv) { */ bool HugoConsole::Cmd_listObjects(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: %s\n", argv[0]); + debugPrintf("Usage: %s\n", argv[0]); return true; } - DebugPrintf("Available objects for this game are:\n"); + debugPrintf("Available objects for this game are:\n"); for (int i = 0; i < _vm->_object->_numObj; i++) { if (_vm->_object->_objects[i]._genericCmd & TAKE) - DebugPrintf("%2d - %s\n", i, _vm->_text->getNoun(_vm->_object->_objects[i]._nounIndex, 2)); + debugPrintf("%2d - %s\n", i, _vm->_text->getNoun(_vm->_object->_objects[i]._nounIndex, 2)); } return true; } @@ -107,14 +107,14 @@ bool HugoConsole::Cmd_listObjects(int argc, const char **argv) { */ bool HugoConsole::Cmd_getObject(int argc, const char **argv) { if ((argc != 2) || (strToInt(argv[1]) > _vm->_object->_numObj)) { - DebugPrintf("Usage: %s \n", argv[0]); + debugPrintf("Usage: %s \n", argv[0]); return true; } if (_vm->_object->_objects[strToInt(argv[1])]._genericCmd & TAKE) _vm->_parser->takeObject(&_vm->_object->_objects[strToInt(argv[1])]); else - DebugPrintf("Object not available\n"); + debugPrintf("Object not available\n"); return true; } @@ -124,7 +124,7 @@ bool HugoConsole::Cmd_getObject(int argc, const char **argv) { */ bool HugoConsole::Cmd_getAllObjects(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: %s\n", argv[0]); + debugPrintf("Usage: %s\n", argv[0]); return true; } @@ -141,7 +141,7 @@ bool HugoConsole::Cmd_getAllObjects(int argc, const char **argv) { */ bool HugoConsole::Cmd_boundaries(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: %s\n", argv[0]); + debugPrintf("Usage: %s\n", argv[0]); return true; } diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index e4806afb70..598eb1c1b0 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -59,10 +59,10 @@ bool Debugger::cmd_setScreenDebug(int argc, const char **argv) { else if (scumm_stricmp(argv[1], "disable") == 0) _vm->screen()->enableScreenDebug(false); else - DebugPrintf("Use screen_debug_mode to enable or disable it.\n"); + debugPrintf("Use screen_debug_mode to enable or disable it.\n"); } else { - DebugPrintf("Screen debug mode is %s.\n", (_vm->screen()->queryScreenDebug() ? "enabled" : "disabled")); - DebugPrintf("Use screen_debug_mode to enable or disable it.\n"); + debugPrintf("Screen debug mode is %s.\n", (_vm->screen()->queryScreenDebug() ? "enabled" : "disabled")); + debugPrintf("Use screen_debug_mode to enable or disable it.\n"); } return true; } @@ -71,14 +71,14 @@ bool Debugger::cmd_loadPalette(int argc, const char **argv) { Palette palette(_vm->screen()->getPalette(0).getNumColors()); if (argc <= 1) { - DebugPrintf("Use load_palette [start_col] [end_col]\n"); + debugPrintf("Use load_palette [start_col] [end_col]\n"); return true; } if (_vm->game() != GI_KYRA1 && _vm->resource()->getFileSize(argv[1]) != 768) { uint8 *buffer = new uint8[320 * 200 * sizeof(uint8)]; if (!buffer) { - DebugPrintf("ERROR: Cannot allocate buffer for screen region!\n"); + debugPrintf("ERROR: Cannot allocate buffer for screen region!\n"); return true; } @@ -89,7 +89,7 @@ bool Debugger::cmd_loadPalette(int argc, const char **argv) { delete[] buffer; } else if (!_vm->screen()->loadPalette(argv[1], palette)) { - DebugPrintf("ERROR: Palette '%s' not found!\n", argv[1]); + debugPrintf("ERROR: Palette '%s' not found!\n", argv[1]); return true; } @@ -112,12 +112,12 @@ bool Debugger::cmd_loadPalette(int argc, const char **argv) { } bool Debugger::cmd_showFacings(int argc, const char **argv) { - DebugPrintf("Facing directions:\n"); - DebugPrintf("7 0 1\n"); - DebugPrintf(" \\ | / \n"); - DebugPrintf("6--*--2\n"); - DebugPrintf(" / | \\\n"); - DebugPrintf("5 4 3\n"); + debugPrintf("Facing directions:\n"); + debugPrintf("7 0 1\n"); + debugPrintf(" \\ | / \n"); + debugPrintf("6--*--2\n"); + debugPrintf(" / | \\\n"); + debugPrintf("5 4 3\n"); return true; } @@ -126,13 +126,13 @@ bool Debugger::cmd_gameSpeed(int argc, const char **argv) { int val = atoi(argv[1]); if (val < 1 || val > 1000) { - DebugPrintf("speed must lie between 1 and 1000 (default: 60)\n"); + debugPrintf("speed must lie between 1 and 1000 (default: 60)\n"); return true; } _vm->_tickLength = (uint8)(1000.0 / val); } else { - DebugPrintf("Syntax: gamespeed \n"); + debugPrintf("Syntax: gamespeed \n"); } return true; @@ -140,13 +140,13 @@ bool Debugger::cmd_gameSpeed(int argc, const char **argv) { bool Debugger::cmd_listFlags(int argc, const char **argv) { for (int i = 0, p = 0; i < (int)sizeof(_vm->_flagsTable) * 8; i++, ++p) { - DebugPrintf("(%-3i): %-2i", i, _vm->queryGameFlag(i)); + debugPrintf("(%-3i): %-2i", i, _vm->queryGameFlag(i)); if (p == 5) { - DebugPrintf("\n"); + debugPrintf("\n"); p -= 6; } } - DebugPrintf("\n"); + debugPrintf("\n"); return true; } @@ -157,9 +157,9 @@ bool Debugger::cmd_toggleFlag(int argc, const char **argv) { _vm->resetGameFlag(flag); else _vm->setGameFlag(flag); - DebugPrintf("Flag %i is now %i\n", flag, _vm->queryGameFlag(flag)); + debugPrintf("Flag %i is now %i\n", flag, _vm->queryGameFlag(flag)); } else { - DebugPrintf("Syntax: toggleflag \n"); + debugPrintf("Syntax: toggleflag \n"); } return true; @@ -168,18 +168,18 @@ bool Debugger::cmd_toggleFlag(int argc, const char **argv) { bool Debugger::cmd_queryFlag(int argc, const char **argv) { if (argc > 1) { uint flag = atoi(argv[1]); - DebugPrintf("Flag %i is %i\n", flag, _vm->queryGameFlag(flag)); + debugPrintf("Flag %i is %i\n", flag, _vm->queryGameFlag(flag)); } else { - DebugPrintf("Syntax: queryflag \n"); + debugPrintf("Syntax: queryflag \n"); } return true; } bool Debugger::cmd_listTimers(int argc, const char **argv) { - DebugPrintf("Current time: %-8u\n", g_system->getMillis()); + debugPrintf("Current time: %-8u\n", g_system->getMillis()); for (int i = 0; i < _vm->timer()->count(); i++) - DebugPrintf("Timer %-2i: Active: %-3s Countdown: %-6i %-8u\n", i, _vm->timer()->isEnabled(i) ? "Yes" : "No", _vm->timer()->getDelay(i), _vm->timer()->getNextRun(i)); + debugPrintf("Timer %-2i: Active: %-3s Countdown: %-6i %-8u\n", i, _vm->timer()->isEnabled(i) ? "Yes" : "No", _vm->timer()->getDelay(i), _vm->timer()->getNextRun(i)); return true; } @@ -189,9 +189,9 @@ bool Debugger::cmd_setTimerCountdown(int argc, const char **argv) { uint timer = atoi(argv[1]); uint countdown = atoi(argv[2]); _vm->timer()->setCountdown(timer, countdown); - DebugPrintf("Timer %i now has countdown %i\n", timer, _vm->timer()->getDelay(timer)); + debugPrintf("Timer %i now has countdown %i\n", timer, _vm->timer()->getDelay(timer)); } else { - DebugPrintf("Syntax: settimercountdown \n"); + debugPrintf("Syntax: settimercountdown \n"); } return true; @@ -218,7 +218,7 @@ bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) { // game will crash if entering a non-existent room if (room >= _vm->_roomTableSize) { - DebugPrintf("room number must be any value between (including) 0 and %d\n", _vm->_roomTableSize - 1); + debugPrintf("room number must be any value between (including) 0 and %d\n", _vm->_roomTableSize - 1); return true; } @@ -246,18 +246,18 @@ bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) { return false; } - DebugPrintf("Syntax: room \n"); + debugPrintf("Syntax: room \n"); return true; } bool Debugger_LoK::cmd_listScenes(int argc, const char **argv) { for (int i = 0; i < _vm->_roomTableSize; i++) { - DebugPrintf("%-3i: %-10s", i, _vm->_roomFilenameTable[_vm->_roomTable[i].nameIndex]); + debugPrintf("%-3i: %-10s", i, _vm->_roomFilenameTable[_vm->_roomTable[i].nameIndex]); if (!(i % 8)) - DebugPrintf("\n"); + debugPrintf("\n"); } - DebugPrintf("\n"); - DebugPrintf("Current room: %i\n", _vm->_currentRoom); + debugPrintf("\n"); + debugPrintf("Current room: %i\n", _vm->_currentRoom); return true; } @@ -267,23 +267,23 @@ bool Debugger_LoK::cmd_giveItem(int argc, const char **argv) { // Kyrandia 1 has only 108 items (-1 to 106), otherwise it will crash if (item < -1 || item > 106) { - DebugPrintf("'itemid' must be any value between (including) -1 and 106\n"); + debugPrintf("'itemid' must be any value between (including) -1 and 106\n"); return true; } _vm->setMouseItem(item); _vm->_itemInHand = item; } else { - DebugPrintf("Syntax: give \n"); + debugPrintf("Syntax: give \n"); } return true; } bool Debugger_LoK::cmd_listBirthstones(int argc, const char **argv) { - DebugPrintf("Needed birthstone gems:\n"); + debugPrintf("Needed birthstone gems:\n"); for (int i = 0; i < ARRAYSIZE(_vm->_birthstoneGemTable); ++i) - DebugPrintf("%-3d '%s'\n", _vm->_birthstoneGemTable[i], _vm->_itemList[_vm->_birthstoneGemTable[i]]); + debugPrintf("%-3d '%s'\n", _vm->_birthstoneGemTable[i], _vm->_itemList[_vm->_birthstoneGemTable[i]]); return true; } @@ -309,7 +309,7 @@ bool Debugger_v2::cmd_enterScene(int argc, const char **argv) { // game will crash if entering a non-existent scene if (scene >= _vm->_sceneListSize) { - DebugPrintf("scene number must be any value between (including) 0 and %d\n", _vm->_sceneListSize - 1); + debugPrintf("scene number must be any value between (including) 0 and %d\n", _vm->_sceneListSize - 1); return true; } @@ -337,7 +337,7 @@ bool Debugger_v2::cmd_enterScene(int argc, const char **argv) { return false; } - DebugPrintf("Syntax: %s \n", argv[0]); + debugPrintf("Syntax: %s \n", argv[0]); return true; } @@ -345,32 +345,32 @@ bool Debugger_v2::cmd_listScenes(int argc, const char **argv) { int shown = 1; for (int i = 0; i < _vm->_sceneListSize; ++i) { if (_vm->_sceneList[i].filename1[0]) { - DebugPrintf("%-2i: %-10s", i, _vm->_sceneList[i].filename1); + debugPrintf("%-2i: %-10s", i, _vm->_sceneList[i].filename1); if (!(shown % 5)) - DebugPrintf("\n"); + debugPrintf("\n"); ++shown; } } - DebugPrintf("\n"); - DebugPrintf("Current scene: %i\n", _vm->_currentScene); + debugPrintf("\n"); + debugPrintf("Current scene: %i\n", _vm->_currentScene); return true; } bool Debugger_v2::cmd_sceneInfo(int argc, const char **argv) { - DebugPrintf("Current scene: %d '%s'\n", _vm->_currentScene, _vm->_sceneList[_vm->_currentScene].filename1); - DebugPrintf("\n"); - DebugPrintf("Exit information:\n"); - DebugPrintf("Exit1: leads to %d, position %dx%d\n", int16(_vm->_sceneExit1), _vm->_sceneEnterX1, _vm->_sceneEnterY1); - DebugPrintf("Exit2: leads to %d, position %dx%d\n", int16(_vm->_sceneExit2), _vm->_sceneEnterX2, _vm->_sceneEnterY2); - DebugPrintf("Exit3: leads to %d, position %dx%d\n", int16(_vm->_sceneExit3), _vm->_sceneEnterX3, _vm->_sceneEnterY3); - DebugPrintf("Exit4: leads to %d, position %dx%d\n", int16(_vm->_sceneExit4), _vm->_sceneEnterX4, _vm->_sceneEnterY4); - DebugPrintf("Special exit information:\n"); + debugPrintf("Current scene: %d '%s'\n", _vm->_currentScene, _vm->_sceneList[_vm->_currentScene].filename1); + debugPrintf("\n"); + debugPrintf("Exit information:\n"); + debugPrintf("Exit1: leads to %d, position %dx%d\n", int16(_vm->_sceneExit1), _vm->_sceneEnterX1, _vm->_sceneEnterY1); + debugPrintf("Exit2: leads to %d, position %dx%d\n", int16(_vm->_sceneExit2), _vm->_sceneEnterX2, _vm->_sceneEnterY2); + debugPrintf("Exit3: leads to %d, position %dx%d\n", int16(_vm->_sceneExit3), _vm->_sceneEnterX3, _vm->_sceneEnterY3); + debugPrintf("Exit4: leads to %d, position %dx%d\n", int16(_vm->_sceneExit4), _vm->_sceneEnterX4, _vm->_sceneEnterY4); + debugPrintf("Special exit information:\n"); if (!_vm->_specialExitCount) { - DebugPrintf("No special exits.\n"); + debugPrintf("No special exits.\n"); } else { - DebugPrintf("This scene has %d special exits.\n", _vm->_specialExitCount); + debugPrintf("This scene has %d special exits.\n", _vm->_specialExitCount); for (int i = 0; i < _vm->_specialExitCount; ++i) { - DebugPrintf("SpecialExit%d: facing %d, position (x1/y1/x2/y2): %d/%d/%d/%d\n", i, + debugPrintf("SpecialExit%d: facing %d, position (x1/y1/x2/y2): %d/%d/%d/%d\n", i, _vm->_specialExitTable[20 + i], _vm->_specialExitTable[0 + i], _vm->_specialExitTable[5 + i], _vm->_specialExitTable[10 + i], _vm->_specialExitTable[15 + i]); } @@ -380,14 +380,14 @@ bool Debugger_v2::cmd_sceneInfo(int argc, const char **argv) { } bool Debugger_v2::cmd_characterInfo(int argc, const char **argv) { - DebugPrintf("Main character is in scene: %d '%s'\n", _vm->_mainCharacter.sceneId, _vm->_sceneList[_vm->_mainCharacter.sceneId].filename1); - DebugPrintf("Position: %dx%d\n", _vm->_mainCharacter.x1, _vm->_mainCharacter.y1); - DebugPrintf("Facing: %d\n", _vm->_mainCharacter.facing); - DebugPrintf("Inventory:\n"); + debugPrintf("Main character is in scene: %d '%s'\n", _vm->_mainCharacter.sceneId, _vm->_sceneList[_vm->_mainCharacter.sceneId].filename1); + debugPrintf("Position: %dx%d\n", _vm->_mainCharacter.x1, _vm->_mainCharacter.y1); + debugPrintf("Facing: %d\n", _vm->_mainCharacter.facing); + debugPrintf("Inventory:\n"); for (int i = 0; i < 20; ++i) { - DebugPrintf("%-2d ", int8(_vm->_mainCharacter.inventory[i])); + debugPrintf("%-2d ", int8(_vm->_mainCharacter.inventory[i])); if (i == 9 || i == 19) - DebugPrintf("\n"); + debugPrintf("\n"); } return true; } @@ -418,9 +418,9 @@ bool Debugger_v2::cmd_sceneToFacing(int argc, const char **argv) { break; } - DebugPrintf("Exit to facing %d leads to room %d.\n", facing, exit); + debugPrintf("Exit to facing %d leads to room %d.\n", facing, exit); } else { - DebugPrintf("Usage: %s \n", argv[0]); + debugPrintf("Usage: %s \n", argv[0]); } return true; @@ -431,13 +431,13 @@ bool Debugger_v2::cmd_giveItem(int argc, const char **argv) { int item = atoi(argv[1]); if (item < -1 || item > _vm->engineDesc().maxItemId) { - DebugPrintf("itemid must be any value between (including) -1 and %d\n", _vm->engineDesc().maxItemId); + debugPrintf("itemid must be any value between (including) -1 and %d\n", _vm->engineDesc().maxItemId); return true; } _vm->setHandItem(item); } else { - DebugPrintf("Syntax: give \n"); + debugPrintf("Syntax: give \n"); } return true; @@ -458,13 +458,13 @@ bool Debugger_HoF::cmd_passcodes(int argc, const char **argv) { int val = atoi(argv[1]); if (val < 0 || val > 1) { - DebugPrintf("value must be either 1 (on) or 0 (off)\n"); + debugPrintf("value must be either 1 (on) or 0 (off)\n"); return true; } _vm->_dbgPass = val; } else { - DebugPrintf("Syntax: pass_codes <0/1>\n"); + debugPrintf("Syntax: pass_codes <0/1>\n"); } return true; @@ -496,21 +496,21 @@ void Debugger_EoB::initialize() { bool Debugger_EoB::cmd_importSaveFile(int argc, const char **argv) { if (!_vm->_allowImport) { - DebugPrintf("This command only works from the main menu.\n"); + debugPrintf("This command only works from the main menu.\n"); return true; } if (argc == 3) { int slot = atoi(argv[1]); if (slot < -1 || slot > 989) { - DebugPrintf("slot must be between (including) -1 and 989 \n"); + debugPrintf("slot must be between (including) -1 and 989 \n"); return true; } - DebugPrintf(_vm->importOriginalSaveFile(slot, argv[2]) ? "Success.\n" : "Failure.\n"); + debugPrintf(_vm->importOriginalSaveFile(slot, argv[2]) ? "Success.\n" : "Failure.\n"); _vm->loadItemDefs(); } else { - DebugPrintf("Syntax: import_savefile \n (Imports source save game file to dest slot.)\n import_savefile -1\n (Imports all original save game files found and puts them into the first available slots.)\n\n"); + debugPrintf("Syntax: import_savefile \n (Imports source save game file to dest slot.)\n import_savefile -1\n (Imports all original save game files found and puts them into the first available slots.)\n\n"); } return true; @@ -518,7 +518,7 @@ bool Debugger_EoB::cmd_importSaveFile(int argc, const char **argv) { bool Debugger_EoB::cmd_saveOriginal(int argc, const char **argv) { if (!_vm->_runFlag) { - DebugPrintf("This command doesn't work during intro or outro sequences,\nfrom the main menu or from the character generation.\n"); + debugPrintf("This command doesn't work during intro or outro sequences,\nfrom the main menu or from the character generation.\n"); return true; } @@ -535,53 +535,53 @@ bool Debugger_EoB::cmd_saveOriginal(int argc, const char **argv) { if (_vm->saveAsOriginalSaveFile()) { Common::FSNode nf = nd.getChild(Common::String::format("EOBDATA.SAV")); if (nf.isReadable()) - DebugPrintf("Saved to file: %s\n\n", nf.getPath().c_str()); + debugPrintf("Saved to file: %s\n\n", nf.getPath().c_str()); else - DebugPrintf("Failure.\n"); + debugPrintf("Failure.\n"); } else { - DebugPrintf("Failure.\n"); + debugPrintf("Failure.\n"); } } else { - DebugPrintf("Syntax: save_original\n (Saves game in original file format to a file which can be used with the orginal game executable.)\n\n"); + debugPrintf("Syntax: save_original\n (Saves game in original file format to a file which can be used with the orginal game executable.)\n\n"); } return true; } else if (argc == 2) { int slot = atoi(argv[1]); if (slot < 0 || slot > 5) { - DebugPrintf("Slot must be between (including) 0 and 5.\n"); + debugPrintf("Slot must be between (including) 0 and 5.\n"); } else if (_vm->saveAsOriginalSaveFile(slot)) { Common::FSNode nf = nd.getChild(Common::String::format("EOBDATA%d.SAV", slot)); if (nf.isReadable()) - DebugPrintf("Saved to file: %s\n\n", nf.getPath().c_str()); + debugPrintf("Saved to file: %s\n\n", nf.getPath().c_str()); else - DebugPrintf("Failure.\n"); + debugPrintf("Failure.\n"); } else { - DebugPrintf("Failure.\n"); + debugPrintf("Failure.\n"); } return true; } - DebugPrintf("Syntax: save_original \n (Saves game in original file format to a file which can be used with the orginal game executable.\n A save slot between 0 and 5 must be specified.)\n\n"); + debugPrintf("Syntax: save_original \n (Saves game in original file format to a file which can be used with the orginal game executable.\n A save slot between 0 and 5 must be specified.)\n\n"); return true; } bool Debugger_EoB::cmd_listMonsters(int, const char **) { - DebugPrintf("\nCurrent level: %d\n----------------------\n\n", _vm->_currentLevel); - DebugPrintf("Id Type Unit Block Position Direction Sub Level Mode Dst.block HP Flags\n--------------------------------------------------------------------------------------------------------------\n"); + debugPrintf("\nCurrent level: %d\n----------------------\n\n", _vm->_currentLevel); + debugPrintf("Id Type Unit Block Position Direction Sub Level Mode Dst.block HP Flags\n--------------------------------------------------------------------------------------------------------------\n"); for (int i = 0; i < 30; i++) { EoBMonsterInPlay *m = &_vm->_monsters[i]; - DebugPrintf("%.02d %.02d %.02d 0x%.04x %d %d %d %.02d 0x%.04x %.03d/%.03d 0x%.02x\n", i, m->type, m->unit, m->block, m->pos, m->dir, m->sub, m->mode, m->dest, m->hitPointsCur, m->hitPointsMax, m->flags); + debugPrintf("%.02d %.02d %.02d 0x%.04x %d %d %d %.02d 0x%.04x %.03d/%.03d 0x%.02x\n", i, m->type, m->unit, m->block, m->pos, m->dir, m->sub, m->mode, m->dest, m->hitPointsCur, m->hitPointsMax, m->flags); } - DebugPrintf("\n"); + debugPrintf("\n"); return true; } bool Debugger_EoB::cmd_showPosition(int, const char **) { - DebugPrintf("\nCurrent level: %d\nCurrent Sub Level: %d\nCurrent block: %d (0x%.04x)\nNext block: %d (0x%.04x)\nCurrent direction: %d\n\n", _vm->_currentLevel, _vm->_currentSub, _vm->_currentBlock, _vm->_currentBlock, _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection), _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection), _vm->_currentDirection); + debugPrintf("\nCurrent level: %d\nCurrent Sub Level: %d\nCurrent block: %d (0x%.04x)\nNext block: %d (0x%.04x)\nCurrent direction: %d\n\n", _vm->_currentLevel, _vm->_currentSub, _vm->_currentBlock, _vm->_currentBlock, _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection), _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection), _vm->_currentDirection); return true; } @@ -593,7 +593,7 @@ bool Debugger_EoB::cmd_setPosition(int argc, const char **argv) { int maxLevel = (_vm->game() == GI_EOB1) ? 12 : 16; if (level < 1 || level > maxLevel) { - DebugPrintf(" must be a value from 1 to %d.\n\n", maxLevel); + debugPrintf(" must be a value from 1 to %d.\n\n", maxLevel); return true; } @@ -613,66 +613,66 @@ bool Debugger_EoB::cmd_setPosition(int argc, const char **argv) { _vm->_sceneUpdateRequired = true; _vm->gui_drawAllCharPortraitsWithStats(); - DebugPrintf("Success.\n\n"); + debugPrintf("Success.\n\n"); } else { - DebugPrintf("Syntax: set_position , , \n"); - DebugPrintf(" (Warning: The sub level and block position parameters will not be checked. Invalid parameters may cause problems.)\n\n"); + debugPrintf("Syntax: set_position , , \n"); + debugPrintf(" (Warning: The sub level and block position parameters will not be checked. Invalid parameters may cause problems.)\n\n"); } return true; } bool Debugger_EoB::cmd_openDoor(int, const char **) { - DebugPrintf("Warning: Using this command may cause glitches.\n"); + debugPrintf("Warning: Using this command may cause glitches.\n"); uint16 block = _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection); int c = (_vm->_wllWallFlags[_vm->_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1; int v = _vm->_levelBlockProperties[block].walls[c]; int flg = (_vm->_flags.gameID == GI_EOB1) ? 1 : 0x10; if (_vm->_wllWallFlags[v] & flg) { - DebugPrintf("Couldn't open any door. Make sure you're facing the door you wish to open and standing right in front of it.\n\n"); + debugPrintf("Couldn't open any door. Make sure you're facing the door you wish to open and standing right in front of it.\n\n"); } else { _vm->openDoor(block); - DebugPrintf("Trying to open door at block %d.\n\n", block); + debugPrintf("Trying to open door at block %d.\n\n", block); } return true; } bool Debugger_EoB::cmd_closeDoor(int, const char **) { - DebugPrintf("Warning: Using this command may cause glitches.\n"); + debugPrintf("Warning: Using this command may cause glitches.\n"); uint16 block = _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection); int c = (_vm->_wllWallFlags[_vm->_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1; int v = _vm->_levelBlockProperties[block].walls[c]; if ((_vm->_flags.gameID == GI_EOB1 && !(_vm->_wllWallFlags[v] & 1)) || (_vm->_flags.gameID == GI_EOB2 && (_vm->_wllWallFlags[v] & 0x20))) { - DebugPrintf("Couldn't close any door. Make sure you're facing the door you wish to close and standing right in front of it.\n\n"); + debugPrintf("Couldn't close any door. Make sure you're facing the door you wish to close and standing right in front of it.\n\n"); } else { _vm->closeDoor(block); - DebugPrintf("Trying to close door at block %d.\n\n", block); + debugPrintf("Trying to close door at block %d.\n\n", block); } return true; } bool Debugger_EoB::cmd_listFlags(int, const char **) { - DebugPrintf("Flag Status\n----------------------\n\n"); + debugPrintf("Flag Status\n----------------------\n\n"); for (int i = 0; i < 32; i++) { uint32 flag = 1 << i; - DebugPrintf("%.2d %s\n", i, _vm->checkScriptFlags(flag) ? "TRUE" : "FALSE"); + debugPrintf("%.2d %s\n", i, _vm->checkScriptFlags(flag) ? "TRUE" : "FALSE"); } - DebugPrintf("\n"); + debugPrintf("\n"); return true; } bool Debugger_EoB::cmd_setFlag(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Syntax: set_flag \n\n"); + debugPrintf("Syntax: set_flag \n\n"); return true; } int flag = atoi(argv[1]); if (flag < 0 || flag > 31) { - DebugPrintf(" must be a value from 0 to 31.\n\n"); + debugPrintf(" must be a value from 0 to 31.\n\n"); } else { _vm->setScriptFlags(1 << flag); - DebugPrintf("Flag '%.2d' has been set.\n\n", flag); + debugPrintf("Flag '%.2d' has been set.\n\n", flag); } return true; @@ -680,16 +680,16 @@ bool Debugger_EoB::cmd_setFlag(int argc, const char **argv) { bool Debugger_EoB::cmd_clearFlag(int argc, const char **argv) { if (argc != 2) { - DebugPrintf("Syntax: clear_flag \n\n"); + debugPrintf("Syntax: clear_flag \n\n"); return true; } int flag = atoi(argv[1]); if (flag < 0 || flag > 31) { - DebugPrintf(" must be a value from 0 to 31.\n\n"); + debugPrintf(" must be a value from 0 to 31.\n\n"); } else { _vm->clearScriptFlags(1 << flag); - DebugPrintf("Flag '%.2d' has been cleared.\n\n", flag); + debugPrintf("Flag '%.2d' has been cleared.\n\n", flag); } return true; diff --git a/engines/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp index 6c2d833271..e13a2f6194 100644 --- a/engines/lastexpress/debug.cpp +++ b/engines/lastexpress/debug.cpp @@ -156,7 +156,7 @@ void Debugger::callCommand() { bool Debugger::loadArchive(int index) { if (index < 1 || index > 3) { - DebugPrintf("Invalid cd number (was: %d, valid: [1-3])\n", index); + debugPrintf("Invalid cd number (was: %d, valid: [1-3])\n", index); return false; } @@ -198,36 +198,36 @@ void Debugger::restoreArchive() const { // Debugger commands ////////////////////////////////////////////////////////////////////////// bool Debugger::cmdHelp(int, const char **) { - DebugPrintf("Debug flags\n"); - DebugPrintf("-----------\n"); - DebugPrintf(" debugflag_list - Lists the available debug flags and their status\n"); - DebugPrintf(" debugflag_enable - Enables a debug flag\n"); - DebugPrintf(" debugflag_disable - Disables a debug flag\n"); - DebugPrintf("\n"); - DebugPrintf("Commands\n"); - DebugPrintf("--------\n"); - DebugPrintf(" ls - list files in the archive\n"); - DebugPrintf(" dump - dump a list of files in all archives\n"); - DebugPrintf("\n"); - DebugPrintf(" showframe - show a frame from a sequence\n"); - DebugPrintf(" showbg - show a background\n"); - DebugPrintf(" playseq - play a sequence\n"); - DebugPrintf(" playsnd - play a sound\n"); - DebugPrintf(" playsbe - play a subtitle\n"); - DebugPrintf(" playnis - play an animation\n"); - DebugPrintf("\n"); - DebugPrintf(" loadscene - load a scene\n"); - DebugPrintf(" fight - start a fight\n"); - DebugPrintf(" beetle - start the beetle game\n"); - DebugPrintf("\n"); - DebugPrintf(" delta - Adjust the time delta\n"); - DebugPrintf(" show - show game data\n"); - DebugPrintf(" entity - show entity data\n"); - DebugPrintf("\n"); - DebugPrintf(" loadgame - load a saved game\n"); - DebugPrintf(" chapter - switch to a specific chapter\n"); - DebugPrintf(" clear - clear the screen\n"); - DebugPrintf("\n"); + debugPrintf("Debug flags\n"); + debugPrintf("-----------\n"); + debugPrintf(" debugflag_list - Lists the available debug flags and their status\n"); + debugPrintf(" debugflag_enable - Enables a debug flag\n"); + debugPrintf(" debugflag_disable - Disables a debug flag\n"); + debugPrintf("\n"); + debugPrintf("Commands\n"); + debugPrintf("--------\n"); + debugPrintf(" ls - list files in the archive\n"); + debugPrintf(" dump - dump a list of files in all archives\n"); + debugPrintf("\n"); + debugPrintf(" showframe - show a frame from a sequence\n"); + debugPrintf(" showbg - show a background\n"); + debugPrintf(" playseq - play a sequence\n"); + debugPrintf(" playsnd - play a sound\n"); + debugPrintf(" playsbe - play a subtitle\n"); + debugPrintf(" playnis - play an animation\n"); + debugPrintf("\n"); + debugPrintf(" loadscene - load a scene\n"); + debugPrintf(" fight - start a fight\n"); + debugPrintf(" beetle - start the beetle game\n"); + debugPrintf("\n"); + debugPrintf(" delta - Adjust the time delta\n"); + debugPrintf(" show - show game data\n"); + debugPrintf(" entity - show entity data\n"); + debugPrintf("\n"); + debugPrintf(" loadgame - load a saved game\n"); + debugPrintf(" chapter - switch to a specific chapter\n"); + debugPrintf(" clear - clear the screen\n"); + debugPrintf("\n"); return true; } @@ -252,15 +252,15 @@ bool Debugger::cmdListFiles(int argc, const char **argv) { Common::ArchiveMemberList list; int count = _engine->getResourceManager()->listMatchingMembers(list, filter); - DebugPrintf("Number of matches: %d\n", count); + debugPrintf("Number of matches: %d\n", count); for (Common::ArchiveMemberList::iterator it = list.begin(); it != list.end(); ++it) - DebugPrintf(" %s\n", (*it)->getName().c_str()); + debugPrintf(" %s\n", (*it)->getName().c_str()); // Restore archive if (argc == 3) restoreArchive(); } else { - DebugPrintf("Syntax: ls (use * for all) ()\n"); + debugPrintf("Syntax: ls (use * for all) ()\n"); } return true; @@ -287,7 +287,7 @@ bool Debugger::cmdDumpFiles(int argc, const char **) { for (Common::ArchiveMemberList::iterator it = list.begin(); it != list.end(); ++it) { \ Common::SeekableReadStream *stream = getArchive((*it)->getName()); \ if (!stream) { \ - DebugPrintf("ERROR: Cannot create stream for file: %s\n", (*it)->getName().c_str()); \ + debugPrintf("ERROR: Cannot create stream for file: %s\n", (*it)->getName().c_str()); \ restoreArchive(); \ return true; \ } \ @@ -311,7 +311,7 @@ bool Debugger::cmdDumpFiles(int argc, const char **) { // Restore current loaded archive restoreArchive(); } else { - DebugPrintf("Syntax: dump"); + debugPrintf("Syntax: dump"); } return true; @@ -336,7 +336,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { } if (!_engine->getResourceManager()->hasFile(filename)) { - DebugPrintf("Cannot find file: %s\n", filename.c_str()); + debugPrintf("Cannot find file: %s\n", filename.c_str()); return true; } @@ -354,7 +354,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { AnimFrame *frame = sequence.getFrame((uint16)getNumber(argv[2])); if (!frame) { - DebugPrintf("Invalid frame index '%s'\n", argv[2]); + debugPrintf("Invalid frame index '%s'\n", argv[2]); resetCommand(); return true; } @@ -375,7 +375,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) { restoreArchive(); } } else { - DebugPrintf("Syntax: cmd_showframe ()\n"); + debugPrintf("Syntax: cmd_showframe ()\n"); } return true; } @@ -398,7 +398,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) { } if (!_engine->getResourceManager()->hasFile(filename + ".BG")) { - DebugPrintf("Cannot find file: %s\n", (filename + ".BG").c_str()); + debugPrintf("Cannot find file: %s\n", (filename + ".BG").c_str()); return true; } @@ -429,7 +429,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: showbg ()\n"); + debugPrintf("Syntax: showbg ()\n"); } return true; } @@ -453,7 +453,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) { } if (!_engine->getResourceManager()->hasFile(filename)) { - DebugPrintf("Cannot find file: %s\n", filename.c_str()); + debugPrintf("Cannot find file: %s\n", filename.c_str()); return true; } @@ -510,7 +510,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) { restoreArchive(); } } else { - DebugPrintf("Syntax: playseq ()\n"); + debugPrintf("Syntax: playseq ()\n"); } return true; } @@ -537,7 +537,7 @@ bool Debugger::cmdPlaySnd(int argc, const char **argv) { name += ".SND"; if (!_engine->getResourceManager()->hasFile(name)) { - DebugPrintf("Cannot find file: %s\n", name.c_str()); + debugPrintf("Cannot find file: %s\n", name.c_str()); return true; } @@ -548,7 +548,7 @@ bool Debugger::cmdPlaySnd(int argc, const char **argv) { if (argc == 3) restoreArchive(); } else { - DebugPrintf("Syntax: playsnd ()\n"); + debugPrintf("Syntax: playsnd ()\n"); } return true; } @@ -573,7 +573,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) { filename += ".sbe"; if (!_engine->getResourceManager()->hasFile(filename)) { - DebugPrintf("Cannot find file: %s\n", filename.c_str()); + debugPrintf("Cannot find file: %s\n", filename.c_str()); return true; } @@ -615,7 +615,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: playsbe ()\n"); + debugPrintf("Syntax: playsbe ()\n"); } return true; } @@ -639,7 +639,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) { // If we got a nis filename, check that the file exists if (name.contains('.') && !_engine->getResourceManager()->hasFile(name)) { - DebugPrintf("Cannot find file: %s\n", name.c_str()); + debugPrintf("Cannot find file: %s\n", name.c_str()); return true; } @@ -672,7 +672,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: playnis ()\n"); + debugPrintf("Syntax: playnis ()\n"); } return true; } @@ -697,7 +697,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { } if (index > 2500) { - DebugPrintf("Error: invalid index value (0-2500)"); + debugPrintf("Error: invalid index value (0-2500)"); return true; } @@ -718,7 +718,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { // loadSceneObject(scene, i); // if (scene.getHeader() && scene.getHeader()->car == 5 && scene.getHeader()->position == 81) { - // DebugPrintf("Found scene: %d", i); + // debugPrintf("Found scene: %d", i); // // Draw scene found // _engine->getGraphicsManager()->draw(&scene, GraphicsManager::kBackgroundC); @@ -738,7 +738,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { /*********************************************/ Scene *scene = getScenes()->get(index); if (!scene) { - DebugPrintf("Cannot load scene %i from CD %i", index, cd); + debugPrintf("Cannot load scene %i from CD %i", index, cd); resetCommand(); return true; @@ -758,7 +758,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: loadscene ()\n"); + debugPrintf("Syntax: loadscene ()\n"); } return true; } @@ -814,7 +814,7 @@ bool Debugger::cmdFight(int argc, const char **argv) { SceneIndex lastScene = getState()->scene; - getFight()->setup(type) ? DebugPrintf("Lost fight!\n") : DebugPrintf("Won fight!\n"); + getFight()->setup(type) ? debugPrintf("Lost fight!\n") : debugPrintf("Won fight!\n"); // Pause for a second to be able to see the final scene _engine->_system->delayMillis(1000); @@ -837,7 +837,7 @@ bool Debugger::cmdFight(int argc, const char **argv) { } } else { error: - DebugPrintf("Syntax: fight (id=2001-2005)\n"); + debugPrintf("Syntax: fight (id=2001-2005)\n"); } return true; @@ -968,7 +968,7 @@ bool Debugger::cmdBeetle(int argc, const char **argv) { resetCommand(); } } else { - DebugPrintf("Syntax: beetle\n"); + debugPrintf("Syntax: beetle\n"); } return true; @@ -992,7 +992,7 @@ bool Debugger::cmdTimeDelta(int argc, const char **argv) { getState()->timeDelta = (uint)delta; } else { label_error: - DebugPrintf("Syntax: delta