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

16 files changed, 36 insertions, 36 deletions

diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp
index 536a1f87bd..7ad742c928 100644
--- a/engines/agos/debugger.cpp
+++ b/engines/agos/debugger.cpp
@@ -32,7 +32,7 @@ Debugger::Debugger(AGOSEngine *vm)
 	: GUI::Debugger() {
 	_vm = vm;
 
-	registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit));
+	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));
diff --git a/engines/cruise/debugger.cpp b/engines/cruise/debugger.cpp
index 0627432ef8..d4e706a094 100644
--- a/engines/cruise/debugger.cpp
+++ b/engines/cruise/debugger.cpp
@@ -29,7 +29,7 @@
 namespace Cruise {
 
 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("items",				WRAP_METHOD(Debugger, cmd_items));
 }
diff --git a/engines/hopkins/debugger.cpp b/engines/hopkins/debugger.cpp
index 323afef70f..3dcfdfea7b 100644
--- a/engines/hopkins/debugger.cpp
+++ b/engines/hopkins/debugger.cpp
@@ -30,7 +30,7 @@ namespace Hopkins {
 
 Debugger::Debugger(HopkinsEngine *vm) : GUI::Debugger() {
 	_vm = vm;
-	registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit));
+	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("rects", WRAP_METHOD(Debugger, cmd_DirtyRects));
 	registerCmd("teleport", WRAP_METHOD(Debugger, cmd_Teleport));
 	registerCmd("show_room", WRAP_METHOD(Debugger, cmd_ShowCurrentRoom));
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index f14c42beea..5630eb48d9 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -40,7 +40,7 @@ Debugger::Debugger(KyraEngine_v1 *vm)
 }
 
 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("load_palette",       WRAP_METHOD(Debugger, cmd_loadPalette));
 	registerCmd("facings",            WRAP_METHOD(Debugger, cmd_showFacings));
diff --git a/engines/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp
index 2fb2cd834b..57943f9a8d 100644
--- a/engines/lastexpress/debug.cpp
+++ b/engines/lastexpress/debug.cpp
@@ -146,7 +146,7 @@ void Debugger::copyCommand(int argc, const char **argv) {
 	}
 
 	// Exit the debugger!
-	Cmd_Exit(0, 0);
+	cmdExit(0, 0);
 }
 
 void Debugger::callCommand() {
@@ -345,7 +345,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) {
 			_command = WRAP_METHOD(Debugger, cmdShowFrame);
 			copyCommand(argc, argv);
 
-			return Cmd_Exit(0, 0);
+			return cmdExit(0, 0);
 		} else {
 			Sequence sequence(filename);
 			if (sequence.load(getArchive(filename))) {
@@ -407,7 +407,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) {
 			_command = WRAP_METHOD(Debugger, cmdShowBg);
 			copyCommand(argc, argv);
 
-			return Cmd_Exit(0, 0);
+			return cmdExit(0, 0);
 		} else {
 			clearBg(GraphicsManager::kBackgroundC);
 
@@ -462,7 +462,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) {
 			_command = WRAP_METHOD(Debugger, cmdPlaySeq);
 			copyCommand(argc, argv);
 
-			return Cmd_Exit(0, 0);
+			return cmdExit(0, 0);
 		} else {
 			Sequence *sequence = new Sequence(filename);
 			if (sequence->load(getArchive(filename))) {
@@ -582,7 +582,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) {
 			_command = WRAP_METHOD(Debugger, cmdPlaySbe);
 			copyCommand(argc, argv);
 
-			return Cmd_Exit(0, 0);
+			return cmdExit(0, 0);
 		} else {
 			SubtitleManager subtitle(_engine->getFont());
 			if (subtitle.load(getArchive(filename))) {
@@ -648,7 +648,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) {
 			_command = WRAP_METHOD(Debugger, cmdPlayNis);
 			copyCommand(argc, argv);
 
-			return Cmd_Exit(0, 0);
+			return cmdExit(0, 0);
 		} else {
 			// Make sure we are not called in a loop
 			_numParams = 0;
@@ -706,7 +706,7 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) {
 			_command = WRAP_METHOD(Debugger, cmdLoadScene);
 			copyCommand(argc, argv);
 
-			return Cmd_Exit(0, 0);
+			return cmdExit(0, 0);
 		} else {
 
 			clearBg(GraphicsManager::kBackgroundAll);
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp
index 7ab32125b5..642376a201 100644
--- a/engines/lure/debugger.cpp
+++ b/engines/lure/debugger.cpp
@@ -35,7 +35,7 @@
 namespace Lure {
 
 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("rooms",				WRAP_METHOD(Debugger, cmd_listRooms));
 	registerCmd("fields",				WRAP_METHOD(Debugger, cmd_listFields));
diff --git a/engines/mads/debugger.cpp b/engines/mads/debugger.cpp
index e82b39f8c2..f301b6c392 100644
--- a/engines/mads/debugger.cpp
+++ b/engines/mads/debugger.cpp
@@ -29,7 +29,7 @@ namespace MADS {
 Debugger::Debugger(MADSEngine *vm) : GUI::Debugger(), _vm(vm) {
 	_showMousePos = false;
 
-	registerCmd("continue",		WRAP_METHOD(Debugger, Cmd_Exit));
+	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse));
 	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
 	registerCmd("show_hotspots", WRAP_METHOD(Debugger, Cmd_ShowHotSpots));
diff --git a/engines/mortevielle/debugger.cpp b/engines/mortevielle/debugger.cpp
index 8418ae056c..b2c99b894a 100644
--- a/engines/mortevielle/debugger.cpp
+++ b/engines/mortevielle/debugger.cpp
@@ -27,7 +27,7 @@ namespace Mortevielle {
 
 Debugger::Debugger(MortevielleEngine *vm) : GUI::Debugger() {
 	_vm = vm;
-	registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit));
+	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("show_questions", WRAP_METHOD(Debugger, Cmd_showAllQuestions));
 	registerCmd("reset_parano", WRAP_METHOD(Debugger, Cmd_resetParano));
 }
diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp
index e4239eb786..a7087c64d7 100644
--- a/engines/parallaction/debug.cpp
+++ b/engines/parallaction/debug.cpp
@@ -33,7 +33,7 @@ Debugger::Debugger(Parallaction *vm)
 	: GUI::Debugger() {
 	_vm = vm;
 
-	registerCmd("continue",	WRAP_METHOD(Debugger, Cmd_Exit));
+	registerCmd("continue",	WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("location",	WRAP_METHOD(Debugger, Cmd_Location));
 	registerCmd("give",		WRAP_METHOD(Debugger, Cmd_Give));
 	registerCmd("zones",		WRAP_METHOD(Debugger, Cmd_Zones));
diff --git a/engines/saga/console.cpp b/engines/saga/console.cpp
index 042635e3e3..0b801eef3e 100644
--- a/engines/saga/console.cpp
+++ b/engines/saga/console.cpp
@@ -35,7 +35,7 @@ namespace Saga {
 Console::Console(SagaEngine *vm) : GUI::Debugger() {
 	_vm = vm;
 
-	registerCmd("continue",			WRAP_METHOD(Console, Cmd_Exit));
+	registerCmd("continue",			WRAP_METHOD(Console, cmdExit));
 
 	// Actor commands
 	registerCmd("actor_walk_to",		WRAP_METHOD(Console, cmdActorWalkTo));
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 1a2ee21fba..1736ac7487 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -1207,13 +1207,13 @@ bool Console::cmdRestoreGame(int argc, const char **argv) {
 		return true;
 	}
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 bool Console::cmdRestartGame(int argc, const char **argv) {
 	_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
@@ -1606,7 +1606,7 @@ bool Console::cmdPlayVideo(int argc, const char **argv) {
 		filename.hasSuffix(".rbt") || filename.hasSuffix(".duk")) {
 		_videoFile = filename;
 		_videoFrameDelay = (argc == 2) ? 10 : atoi(argv[2]);
-		return Cmd_Exit(0, 0);
+		return cmdExit(0, 0);
 	} else {
 		debugPrintf("Unknown video file type\n");
 		return true;
@@ -2108,7 +2108,7 @@ bool Console::cmdShowMap(int argc, const char **argv) {
 		debugPrintf("Map %d is not available.\n", map);
 		return true;
 	}
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 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);
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 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.debugging = true;
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 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.debugging = true;
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 bool Console::cmdStepEvent(int argc, const char **argv) {
 	_debugState.stopOnEvent = true;
 	_debugState.debugging = true;
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 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.debugging = true;
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 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.debugging = true;
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 bool Console::cmdStepCallk(int argc, const char **argv) {
@@ -2856,7 +2856,7 @@ bool Console::cmdStepCallk(int argc, const char **argv) {
 	}
 	_debugState.debugging = true;
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 bool Console::cmdDisassemble(int argc, const char **argv) {
@@ -3205,7 +3205,7 @@ bool Console::cmdGo(int argc, const char **argv) {
 	// CHECKME: is this necessary?
 	_debugState.seeking = kDebugSeekNothing;
 
-	return Cmd_Exit(argc, argv);
+	return cmdExit(argc, argv);
 }
 
 bool Console::cmdLogKernel(int argc, const char **argv) {
@@ -3619,7 +3619,7 @@ bool Console::cmdQuit(int argc, const char **argv) {
 		return true;
 	}
 
-	return Cmd_Exit(0, 0);
+	return cmdExit(0, 0);
 }
 
 bool Console::cmdAddresses(int argc, const char **argv) {
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index fed523fad2..a08fa6e3d2 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -64,7 +64,7 @@ ScummDebugger::ScummDebugger(ScummEngine *s)
 	registerVar("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables);
 
 	// Register commands
-	registerCmd("continue",  WRAP_METHOD(ScummDebugger, Cmd_Exit));
+	registerCmd("continue",  WRAP_METHOD(ScummDebugger, cmdExit));
 	registerCmd("restart",   WRAP_METHOD(ScummDebugger, Cmd_Restart));
 
 	registerCmd("actor",     WRAP_METHOD(ScummDebugger, Cmd_Actor));
diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp
index 810b40c583..0aa78f552b 100644
--- a/engines/sword2/console.cpp
+++ b/engines/sword2/console.cpp
@@ -82,8 +82,8 @@ Debugger::Debugger(Sword2Engine *vm)
 
 	// Register commands
 
-	registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit));
-	registerCmd("q",        WRAP_METHOD(Debugger, Cmd_Exit));
+	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
+	registerCmd("q",        WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("mem",      WRAP_METHOD(Debugger, Cmd_Mem));
 	registerCmd("tony",     WRAP_METHOD(Debugger, Cmd_Tony));
 	registerCmd("res",      WRAP_METHOD(Debugger, Cmd_Res));
diff --git a/engines/tony/debugger.cpp b/engines/tony/debugger.cpp
index 0e59fb8470..e192c53d2b 100644
--- a/engines/tony/debugger.cpp
+++ b/engines/tony/debugger.cpp
@@ -28,7 +28,7 @@
 namespace Tony {
 
 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("dirty_rects",	WRAP_METHOD(Debugger, Cmd_DirtyRects));
 }
diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index b0e741198b..b647807f8a 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -30,7 +30,7 @@
 namespace TsAGE {
 
 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("walk_regions",     WRAP_METHOD(Debugger, Cmd_WalkRegions));
 	registerCmd("priority_regions", WRAP_METHOD(Debugger, Cmd_PriorityRegions));
diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp
index 71a0e7e853..afa24078fd 100644
--- a/engines/voyeur/debugger.cpp
+++ b/engines/voyeur/debugger.cpp
@@ -29,8 +29,8 @@ namespace Voyeur {
 
 Debugger::Debugger(VoyeurEngine *vm) : GUI::Debugger(), _vm(vm) {
 	// Register methods
-	registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit));
-	registerCmd("exit", WRAP_METHOD(Debugger, Cmd_Exit));
+	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
+	registerCmd("exit", WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("time", WRAP_METHOD(Debugger, Cmd_Time));
 	registerCmd("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots));
 	registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse));