SHERLOCK: Cleanup for Debugger class

scummvm · May 9, 2015 · 4950dea · 4950dea
1 parent 5d41f0f
commit 4950dea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
@@ -27,13 +27,13 @@ namespace Sherlock {
 
 Debugger::Debugger(SherlockEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
-	registerCmd("scene", WRAP_METHOD(Debugger, cmd_scene));
+	registerCmd("scene", WRAP_METHOD(Debugger, cmdScene));
 }
 
 /**
  * Converts a decimal or hexadecimal string into a number
  */
-static int strToInt(const char *s) {
+int Debugger::strToInt(const char *s) {
 	if (!*s)
 		// No string at all
 		return 0;
@@ -52,7 +52,7 @@ static int strToInt(const char *s) {
 /**
  * Switch to another scene
  */
-bool Debugger::cmd_scene(int argc, const char **argv) {
+bool Debugger::cmdScene(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Format: scene <room>\n");
 		return true;

diff --git a/engines/sherlock/debugger.h b/engines/sherlock/debugger.h
@@ -33,8 +33,10 @@ class SherlockEngine;
 class Debugger : public GUI::Debugger {
 private:
 	SherlockEngine *_vm;
-protected:
-	bool cmd_scene(int argc, const char **argv);
+
+	int strToInt(const char *s);
+
+	bool cmdScene(int argc, const char **argv);
 public:
 	Debugger(SherlockEngine *vm);
 	virtual ~Debugger() {}