Merge remote-tracking branch 'own/prince' into prince-malik

Conflicts:
	engines/prince/debugger.cpp
	engines/prince/debugger.h
	engines/prince/detection.cpp
	engines/prince/font.cpp
	engines/prince/graphics.cpp
	engines/prince/prince.cpp
	engines/prince/prince.h
	engines/prince/script.cpp
	engines/prince/script.h

1 files changed, 11 insertions, 8 deletions

diff --git a/engines/prince/debugger.h b/engines/prince/debugger.h
index c5a8be60c6..08b1676fd7 100644
--- a/engines/prince/debugger.h
+++ b/engines/prince/debugger.h
@@ -32,16 +32,19 @@ class PrinceEngine;
 
 class Debugger : public GUI::Debugger {
 public:
-    Debugger(PrinceEngine *vm);
-    virtual ~Debugger() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
+	Debugger(PrinceEngine *vm);
+	virtual ~Debugger() {}	// we need this for __SYMBIAN32__ archaic gcc/UIQ
 
 private:
-    bool Cmd_SetFlag(int argc, const char **argv);
-    bool Cmd_GetFlag(int argc, const char **argv);
-    bool Cmd_ClearFlag(int argc, const char **argv);
-    bool Cmd_ViewFlc(int argc, const char **argv);
-
-    PrinceEngine *_vm;
+	bool Cmd_DebugLevel(int argc, const char **argv);
+	bool Cmd_SetFlag(int argc, const char **argv);
+	bool Cmd_GetFlag(int argc, const char **argv);
+	bool Cmd_ClearFlag(int argc, const char **argv);
+	bool Cmd_ViewFlc(int argc, const char **argv);
+	bool Cmd_InitRoom(int argc, const char **argv);
+	bool Cmd_ChangeCursor(int argc, const char **argv);
+
+	PrinceEngine *_vm;
 };