thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Make Debugger command function names conform to our guidelines.

Browse source
This commit is contained in:
Johannes Schickel 2014-05-27 02:04:08 +02:00
parent 07c9fea9cb
commit 30d64edac4
18 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/agos/debugger.cpp
View file

@ -32,7 +32,7 @@ Debugger::Debugger(AGOSEngine *vm)
: GUI::Debugger() { : GUI::Debugger() {
_vm = vm; _vm = vm;
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("music", WRAP_METHOD(Debugger, Cmd_PlayMusic)); registerCmd("music", WRAP_METHOD(Debugger, Cmd_PlayMusic));
registerCmd("sound", WRAP_METHOD(Debugger, Cmd_PlaySound)); registerCmd("sound", WRAP_METHOD(Debugger, Cmd_PlaySound));
registerCmd("voice", WRAP_METHOD(Debugger, Cmd_PlayVoice)); registerCmd("voice", WRAP_METHOD(Debugger, Cmd_PlayVoice));

2
engines/cruise/debugger.cpp
View file

@ -29,7 +29,7 @@
namespace Cruise { namespace Cruise {
Debugger::Debugger(): GUI::Debugger() { Debugger::Debugger(): GUI::Debugger() {
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("hotspots", WRAP_METHOD(Debugger, cmd_hotspots)); registerCmd("hotspots", WRAP_METHOD(Debugger, cmd_hotspots));
registerCmd("items", WRAP_METHOD(Debugger, cmd_items)); registerCmd("items", WRAP_METHOD(Debugger, cmd_items));
} }

2
engines/hopkins/debugger.cpp
View file

@ -30,7 +30,7 @@ namespace Hopkins {
Debugger::Debugger(HopkinsEngine *vm) : GUI::Debugger() { Debugger::Debugger(HopkinsEngine *vm) : GUI::Debugger() {
_vm = vm; _vm = vm;
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("rects", WRAP_METHOD(Debugger, cmd_DirtyRects)); registerCmd("rects", WRAP_METHOD(Debugger, cmd_DirtyRects));
registerCmd("teleport", WRAP_METHOD(Debugger, cmd_Teleport)); registerCmd("teleport", WRAP_METHOD(Debugger, cmd_Teleport));
registerCmd("show_room", WRAP_METHOD(Debugger, cmd_ShowCurrentRoom)); registerCmd("show_room", WRAP_METHOD(Debugger, cmd_ShowCurrentRoom));

2
engines/kyra/debugger.cpp
View file

@ -40,7 +40,7 @@ Debugger::Debugger(KyraEngine_v1 *vm)
} }
void Debugger::initialize() { void Debugger::initialize() {
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("screen_debug_mode", WRAP_METHOD(Debugger, cmd_setScreenDebug)); registerCmd("screen_debug_mode", WRAP_METHOD(Debugger, cmd_setScreenDebug));
registerCmd("load_palette", WRAP_METHOD(Debugger, cmd_loadPalette)); registerCmd("load_palette", WRAP_METHOD(Debugger, cmd_loadPalette));
registerCmd("facings", WRAP_METHOD(Debugger, cmd_showFacings)); registerCmd("facings", WRAP_METHOD(Debugger, cmd_showFacings));

14
engines/lastexpress/debug.cpp
View file

@ -146,7 +146,7 @@ void Debugger::copyCommand(int argc, const char **argv) {
} }
// Exit the debugger! // Exit the debugger!
Cmd_Exit(0, 0); cmdExit(0, 0);
} }
void Debugger::callCommand() { void Debugger::callCommand() {
@ -345,7 +345,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) {
_command = WRAP_METHOD(Debugger, cmdShowFrame); _command = WRAP_METHOD(Debugger, cmdShowFrame);
copyCommand(argc, argv); copyCommand(argc, argv);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
Sequence sequence(filename); Sequence sequence(filename);
if (sequence.load(getArchive(filename))) { if (sequence.load(getArchive(filename))) {
@ -407,7 +407,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) {
_command = WRAP_METHOD(Debugger, cmdShowBg); _command = WRAP_METHOD(Debugger, cmdShowBg);
copyCommand(argc, argv); copyCommand(argc, argv);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
clearBg(GraphicsManager::kBackgroundC); clearBg(GraphicsManager::kBackgroundC);
@ -462,7 +462,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) {
_command = WRAP_METHOD(Debugger, cmdPlaySeq); _command = WRAP_METHOD(Debugger, cmdPlaySeq);
copyCommand(argc, argv); copyCommand(argc, argv);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
Sequence *sequence = new Sequence(filename); Sequence *sequence = new Sequence(filename);
if (sequence->load(getArchive(filename))) { if (sequence->load(getArchive(filename))) {
@ -582,7 +582,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) {
_command = WRAP_METHOD(Debugger, cmdPlaySbe); _command = WRAP_METHOD(Debugger, cmdPlaySbe);
copyCommand(argc, argv); copyCommand(argc, argv);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
SubtitleManager subtitle(_engine->getFont()); SubtitleManager subtitle(_engine->getFont());
if (subtitle.load(getArchive(filename))) { if (subtitle.load(getArchive(filename))) {
@ -648,7 +648,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) {
_command = WRAP_METHOD(Debugger, cmdPlayNis); _command = WRAP_METHOD(Debugger, cmdPlayNis);
copyCommand(argc, argv); copyCommand(argc, argv);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
// Make sure we are not called in a loop // Make sure we are not called in a loop
_numParams = 0; _numParams = 0;
@ -706,7 +706,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) {
_command = WRAP_METHOD(Debugger, cmdLoadScene); _command = WRAP_METHOD(Debugger, cmdLoadScene);
copyCommand(argc, argv); copyCommand(argc, argv);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
clearBg(GraphicsManager::kBackgroundAll); clearBg(GraphicsManager::kBackgroundAll);

2
engines/lure/debugger.cpp
View file

@ -35,7 +35,7 @@
namespace Lure { namespace Lure {
Debugger::Debugger(): GUI::Debugger() { Debugger::Debugger(): GUI::Debugger() {
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("enter", WRAP_METHOD(Debugger, cmd_enterRoom)); registerCmd("enter", WRAP_METHOD(Debugger, cmd_enterRoom));
registerCmd("rooms", WRAP_METHOD(Debugger, cmd_listRooms)); registerCmd("rooms", WRAP_METHOD(Debugger, cmd_listRooms));
registerCmd("fields", WRAP_METHOD(Debugger, cmd_listFields)); registerCmd("fields", WRAP_METHOD(Debugger, cmd_listFields));

2
engines/mads/debugger.cpp
View file

@ -29,7 +29,7 @@ namespace MADS {
Debugger::Debugger(MADSEngine *vm) : GUI::Debugger(), _vm(vm) { Debugger::Debugger(MADSEngine *vm) : GUI::Debugger(), _vm(vm) {
_showMousePos = false; _showMousePos = false;
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse)); registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse));
registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene)); registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
registerCmd("show_hotspots", WRAP_METHOD(Debugger, Cmd_ShowHotSpots)); registerCmd("show_hotspots", WRAP_METHOD(Debugger, Cmd_ShowHotSpots));

2
engines/mortevielle/debugger.cpp
View file

@ -27,7 +27,7 @@ namespace Mortevielle {
Debugger::Debugger(MortevielleEngine *vm) : GUI::Debugger() { Debugger::Debugger(MortevielleEngine *vm) : GUI::Debugger() {
_vm = vm; _vm = vm;
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("show_questions", WRAP_METHOD(Debugger, Cmd_showAllQuestions)); registerCmd("show_questions", WRAP_METHOD(Debugger, Cmd_showAllQuestions));
registerCmd("reset_parano", WRAP_METHOD(Debugger, Cmd_resetParano)); registerCmd("reset_parano", WRAP_METHOD(Debugger, Cmd_resetParano));
} }

2
engines/parallaction/debug.cpp
View file

@ -33,7 +33,7 @@ Debugger::Debugger(Parallaction *vm)
: GUI::Debugger() { : GUI::Debugger() {
_vm = vm; _vm = vm;
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("location", WRAP_METHOD(Debugger, Cmd_Location)); registerCmd("location", WRAP_METHOD(Debugger, Cmd_Location));
registerCmd("give", WRAP_METHOD(Debugger, Cmd_Give)); registerCmd("give", WRAP_METHOD(Debugger, Cmd_Give));
registerCmd("zones", WRAP_METHOD(Debugger, Cmd_Zones)); registerCmd("zones", WRAP_METHOD(Debugger, Cmd_Zones));

2
engines/saga/console.cpp
View file

@ -35,7 +35,7 @@ namespace Saga {
Console::Console(SagaEngine *vm) : GUI::Debugger() { Console::Console(SagaEngine *vm) : GUI::Debugger() {
_vm = vm; _vm = vm;
registerCmd("continue", WRAP_METHOD(Console, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Console, cmdExit));
// Actor commands // Actor commands
registerCmd("actor_walk_to", WRAP_METHOD(Console, cmdActorWalkTo)); registerCmd("actor_walk_to", WRAP_METHOD(Console, cmdActorWalkTo));

26
engines/sci/console.cpp
View file

@ -1207,13 +1207,13 @@ bool Console::cmdRestoreGame(int argc, const char **argv) {
return true; return true;
} }
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdRestartGame(int argc, const char **argv) { bool Console::cmdRestartGame(int argc, const char **argv) {
_engine->_gamestate->abortScriptProcessing = kAbortRestartGame; _engine->_gamestate->abortScriptProcessing = kAbortRestartGame;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
// The scripts get IDs ranging from 100->199, because the scripts require us to assign unique ids THAT EVEN STAY BETWEEN // The scripts get IDs ranging from 100->199, because the scripts require us to assign unique ids THAT EVEN STAY BETWEEN
@ -1606,7 +1606,7 @@ bool Console::cmdPlayVideo(int argc, const char **argv) {
filename.hasSuffix(".rbt") || filename.hasSuffix(".duk")) { filename.hasSuffix(".rbt") || filename.hasSuffix(".duk")) {
_videoFile = filename; _videoFile = filename;
_videoFrameDelay = (argc == 2) ? 10 : atoi(argv[2]); _videoFrameDelay = (argc == 2) ? 10 : atoi(argv[2]);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} else { } else {
debugPrintf("Unknown video file type\n"); debugPrintf("Unknown video file type\n");
return true; return true;
@ -2108,7 +2108,7 @@ bool Console::cmdShowMap(int argc, const char **argv) {
debugPrintf("Map %d is not available.\n", map); debugPrintf("Map %d is not available.\n", map);
return true; return true;
} }
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdSongLib(int argc, const char **argv) { bool Console::cmdSongLib(int argc, const char **argv) {
@ -2153,7 +2153,7 @@ bool Console::cmdStartSound(int argc, const char **argv) {
} }
g_sci->_soundCmd->startNewSound(number); g_sci->_soundCmd->startNewSound(number);
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdToggleSound(int argc, const char **argv) { bool Console::cmdToggleSound(int argc, const char **argv) {
@ -2786,7 +2786,7 @@ bool Console::cmdTrace(int argc, const char **argv) {
_debugState.runningStep = atoi(argv[1]) - 1; _debugState.runningStep = atoi(argv[1]) - 1;
_debugState.debugging = true; _debugState.debugging = true;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdStepOver(int argc, const char **argv) { bool Console::cmdStepOver(int argc, const char **argv) {
@ -2794,14 +2794,14 @@ bool Console::cmdStepOver(int argc, const char **argv) {
_debugState.seekLevel = _engine->_gamestate->_executionStack.size(); _debugState.seekLevel = _engine->_gamestate->_executionStack.size();
_debugState.debugging = true; _debugState.debugging = true;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdStepEvent(int argc, const char **argv) { bool Console::cmdStepEvent(int argc, const char **argv) {
_debugState.stopOnEvent = true; _debugState.stopOnEvent = true;
_debugState.debugging = true; _debugState.debugging = true;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdStepRet(int argc, const char **argv) { bool Console::cmdStepRet(int argc, const char **argv) {
@ -2809,7 +2809,7 @@ bool Console::cmdStepRet(int argc, const char **argv) {
_debugState.seekLevel = _engine->_gamestate->_executionStack.size() - 1; _debugState.seekLevel = _engine->_gamestate->_executionStack.size() - 1;
_debugState.debugging = true; _debugState.debugging = true;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdStepGlobal(int argc, const char **argv) { bool Console::cmdStepGlobal(int argc, const char **argv) {
@ -2823,7 +2823,7 @@ bool Console::cmdStepGlobal(int argc, const char **argv) {
_debugState.seekSpecial = atoi(argv[1]); _debugState.seekSpecial = atoi(argv[1]);
_debugState.debugging = true; _debugState.debugging = true;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdStepCallk(int argc, const char **argv) { bool Console::cmdStepCallk(int argc, const char **argv) {
@ -2856,7 +2856,7 @@ bool Console::cmdStepCallk(int argc, const char **argv) {
} }
_debugState.debugging = true; _debugState.debugging = true;
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdDisassemble(int argc, const char **argv) { bool Console::cmdDisassemble(int argc, const char **argv) {
@ -3205,7 +3205,7 @@ bool Console::cmdGo(int argc, const char **argv) {
// CHECKME: is this necessary? // CHECKME: is this necessary?
_debugState.seeking = kDebugSeekNothing; _debugState.seeking = kDebugSeekNothing;
return Cmd_Exit(argc, argv); return cmdExit(argc, argv);
} }
bool Console::cmdLogKernel(int argc, const char **argv) { bool Console::cmdLogKernel(int argc, const char **argv) {
@ -3619,7 +3619,7 @@ bool Console::cmdQuit(int argc, const char **argv) {
return true; return true;
} }
return Cmd_Exit(0, 0); return cmdExit(0, 0);
} }
bool Console::cmdAddresses(int argc, const char **argv) { bool Console::cmdAddresses(int argc, const char **argv) {

2
engines/scumm/debugger.cpp
View file

@ -64,7 +64,7 @@ ScummDebugger::ScummDebugger(ScummEngine *s)
registerVar("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables); registerVar("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables);
// Register commands // Register commands
registerCmd("continue", WRAP_METHOD(ScummDebugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(ScummDebugger, cmdExit));
registerCmd("restart", WRAP_METHOD(ScummDebugger, Cmd_Restart)); registerCmd("restart", WRAP_METHOD(ScummDebugger, Cmd_Restart));
registerCmd("actor", WRAP_METHOD(ScummDebugger, Cmd_Actor)); registerCmd("actor", WRAP_METHOD(ScummDebugger, Cmd_Actor));

4
engines/sword2/console.cpp
View file

@ -82,8 +82,8 @@ Debugger::Debugger(Sword2Engine *vm)
// Register commands // Register commands
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("q", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("q", WRAP_METHOD(Debugger, cmdExit));
registerCmd("mem", WRAP_METHOD(Debugger, Cmd_Mem)); registerCmd("mem", WRAP_METHOD(Debugger, Cmd_Mem));
registerCmd("tony", WRAP_METHOD(Debugger, Cmd_Tony)); registerCmd("tony", WRAP_METHOD(Debugger, Cmd_Tony));
registerCmd("res", WRAP_METHOD(Debugger, Cmd_Res)); registerCmd("res", WRAP_METHOD(Debugger, Cmd_Res));

2
engines/tony/debugger.cpp
View file

@ -28,7 +28,7 @@
namespace Tony { namespace Tony {
Debugger::Debugger() : GUI::Debugger() { Debugger::Debugger() : GUI::Debugger() {
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("scene", WRAP_METHOD(Debugger, Cmd_Scene)); registerCmd("scene", WRAP_METHOD(Debugger, Cmd_Scene));
registerCmd("dirty_rects", WRAP_METHOD(Debugger, Cmd_DirtyRects)); registerCmd("dirty_rects", WRAP_METHOD(Debugger, Cmd_DirtyRects));
} }

2
engines/tsage/debugger.cpp
View file

@ -30,7 +30,7 @@
namespace TsAGE { namespace TsAGE {
Debugger::Debugger() : GUI::Debugger() { Debugger::Debugger() : GUI::Debugger() {
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("scene", WRAP_METHOD(Debugger, Cmd_Scene)); registerCmd("scene", WRAP_METHOD(Debugger, Cmd_Scene));
registerCmd("walk_regions", WRAP_METHOD(Debugger, Cmd_WalkRegions)); registerCmd("walk_regions", WRAP_METHOD(Debugger, Cmd_WalkRegions));
registerCmd("priority_regions", WRAP_METHOD(Debugger, Cmd_PriorityRegions)); registerCmd("priority_regions", WRAP_METHOD(Debugger, Cmd_PriorityRegions));

4
engines/voyeur/debugger.cpp
View file

@ -29,8 +29,8 @@ namespace Voyeur {
Debugger::Debugger(VoyeurEngine *vm) : GUI::Debugger(), _vm(vm) { Debugger::Debugger(VoyeurEngine *vm) : GUI::Debugger(), _vm(vm) {
// Register methods // Register methods
registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("exit", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("exit", WRAP_METHOD(Debugger, cmdExit));
registerCmd("time", WRAP_METHOD(Debugger, Cmd_Time)); registerCmd("time", WRAP_METHOD(Debugger, Cmd_Time));
registerCmd("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots)); registerCmd("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots));
registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse)); registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse));

32
gui/debugger.cpp
View file

@ -55,17 +55,17 @@ Debugger::Debugger() {
registerVar("debug_countdown", &_frameCountdown, DVAR_INT, 0); registerVar("debug_countdown", &_frameCountdown, DVAR_INT, 0);
// Register commands // Register commands
//registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); //registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
registerCmd("exit", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("exit", WRAP_METHOD(Debugger, cmdExit));
registerCmd("quit", WRAP_METHOD(Debugger, Cmd_Exit)); registerCmd("quit", WRAP_METHOD(Debugger, cmdExit));
registerCmd("help", WRAP_METHOD(Debugger, Cmd_Help)); registerCmd("help", WRAP_METHOD(Debugger, cmdHelp));
registerCmd("openlog", WRAP_METHOD(Debugger, Cmd_OpenLog)); registerCmd("openlog", WRAP_METHOD(Debugger, cmdOpenLog));
registerCmd("debuglevel", WRAP_METHOD(Debugger, Cmd_DebugLevel)); registerCmd("debuglevel", WRAP_METHOD(Debugger, cmdDebugLevel));
registerCmd("debugflag_list", WRAP_METHOD(Debugger, Cmd_DebugFlagsList)); registerCmd("debugflag_list", WRAP_METHOD(Debugger, cmdDebugFlagsList));
registerCmd("debugflag_enable", WRAP_METHOD(Debugger, Cmd_DebugFlagEnable)); registerCmd("debugflag_enable", WRAP_METHOD(Debugger, cmdDebugFlagEnable));
registerCmd("debugflag_disable", WRAP_METHOD(Debugger, Cmd_DebugFlagDisable)); registerCmd("debugflag_disable", WRAP_METHOD(Debugger, cmdDebugFlagDisable));
} }
Debugger::~Debugger() { Debugger::~Debugger() {
@ -428,14 +428,14 @@ void Debugger::registerCmd(const Common::String &cmdname, Debuglet *debuglet) {
// Detach ("exit") the debugger // Detach ("exit") the debugger
bool Debugger::Cmd_Exit(int argc, const char **argv) { bool Debugger::cmdExit(int argc, const char **argv) {
detach(); detach();
return false; return false;
} }
// Print a list of all registered commands (and variables, if any), // Print a list of all registered commands (and variables, if any),
// nicely word-wrapped. // nicely word-wrapped.
bool Debugger::Cmd_Help(int argc, const char **argv) { bool Debugger::cmdHelp(int argc, const char **argv) {
#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER #ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
const int charsPerLine = _debuggerDialog->getCharsPerLine(); const int charsPerLine = _debuggerDialog->getCharsPerLine();
#elif defined(USE_READLINE) #elif defined(USE_READLINE)
@ -494,7 +494,7 @@ bool Debugger::Cmd_Help(int argc, const char **argv) {
return true; return true;
} }
bool Debugger::Cmd_OpenLog(int argc, const char **argv) { bool Debugger::cmdOpenLog(int argc, const char **argv) {
if (g_system->hasFeature(OSystem::kFeatureDisplayLogFile)) if (g_system->hasFeature(OSystem::kFeatureDisplayLogFile))
g_system->displayLogFile(); g_system->displayLogFile();
else else
@ -503,7 +503,7 @@ bool Debugger::Cmd_OpenLog(int argc, const char **argv) {
} }
bool Debugger::Cmd_DebugLevel(int argc, const char **argv) { bool Debugger::cmdDebugLevel(int argc, const char **argv) {
if (argc == 1) { // print level if (argc == 1) { // print level
debugPrintf("Debugging is currently %s (set at level %d)\n", (gDebugLevel >= 0) ? "enabled" : "disabled", gDebugLevel); debugPrintf("Debugging is currently %s (set at level %d)\n", (gDebugLevel >= 0) ? "enabled" : "disabled", gDebugLevel);
debugPrintf("Usage: %s <n> where n is 0 to 10 or -1 to disable debugging\n", argv[0]); debugPrintf("Usage: %s <n> where n is 0 to 10 or -1 to disable debugging\n", argv[0]);
@ -522,7 +522,7 @@ bool Debugger::Cmd_DebugLevel(int argc, const char **argv) {
return true; return true;
} }
bool Debugger::Cmd_DebugFlagsList(int argc, const char **argv) { bool Debugger::cmdDebugFlagsList(int argc, const char **argv) {
const Common::DebugManager::DebugChannelList &debugLevels = DebugMan.listDebugChannels(); const Common::DebugManager::DebugChannelList &debugLevels = DebugMan.listDebugChannels();
debugPrintf("Engine debug levels:\n"); debugPrintf("Engine debug levels:\n");
@ -540,7 +540,7 @@ bool Debugger::Cmd_DebugFlagsList(int argc, const char **argv) {
return true; return true;
} }
bool Debugger::Cmd_DebugFlagEnable(int argc, const char **argv) { bool Debugger::cmdDebugFlagEnable(int argc, const char **argv) {
if (argc < 2) { if (argc < 2) {
debugPrintf("debugflag_enable <flag>\n"); debugPrintf("debugflag_enable <flag>\n");
} else { } else {
@ -553,7 +553,7 @@ bool Debugger::Cmd_DebugFlagEnable(int argc, const char **argv) {
return true; return true;
} }
bool Debugger::Cmd_DebugFlagDisable(int argc, const char **argv) { bool Debugger::cmdDebugFlagDisable(int argc, const char **argv) {
if (argc < 2) { if (argc < 2) {
debugPrintf("debugflag_disable <flag>\n"); debugPrintf("debugflag_disable <flag>\n");
} else { } else {

16
gui/debugger.h
View file

@ -168,7 +168,7 @@ protected:
virtual void postEnter(); virtual void postEnter();
/** /**
* Subclasses should invoke the detach() method in their Cmd_FOO methods * Subclasses should invoke the detach() method in their cmdFOO methods
* if that command will resume execution of the program (as opposed to * if that command will resume execution of the program (as opposed to
* executing, say, a "single step through code" command). * executing, say, a "single step through code" command).
* *
@ -190,13 +190,13 @@ private:
virtual bool handleCommand(int argc, const char **argv, bool &keepRunning); virtual bool handleCommand(int argc, const char **argv, bool &keepRunning);
protected: protected:
bool Cmd_Exit(int argc, const char **argv); bool cmdExit(int argc, const char **argv);
bool Cmd_Help(int argc, const char **argv); bool cmdHelp(int argc, const char **argv);
bool Cmd_OpenLog(int argc, const char **argv); bool cmdOpenLog(int argc, const char **argv);
bool Cmd_DebugLevel(int argc, const char **argv); bool cmdDebugLevel(int argc, const char **argv);
bool Cmd_DebugFlagsList(int argc, const char **argv); bool cmdDebugFlagsList(int argc, const char **argv);
bool Cmd_DebugFlagEnable(int argc, const char **argv); bool cmdDebugFlagEnable(int argc, const char **argv);
bool Cmd_DebugFlagDisable(int argc, const char **argv); bool cmdDebugFlagDisable(int argc, const char **argv);
#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER #ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
private: private: