Merge branch 'master' into hopkins

1 files changed, 6 insertions, 7 deletions

diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index d24b120658..fcaa2840a9 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -48,6 +48,9 @@ public:
 	WintermuteEngine();
 	~WintermuteEngine();
 
+	virtual GUI::Debugger *getDebugger() { return _debugger; }
+	void trigDebugger() { _trigDebug = true; }
+
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
 	Common::SaveFileManager *getSaveFileMan() { return _saveFileMan; }
@@ -58,19 +61,15 @@ public:
 	// For detection-purposes:
 	static bool getGameInfo(const Common::FSList &fslist, Common::String &name, Common::String &caption);
 private:
+	bool _trigDebug;
 	int init();
 	void deinit();
 	int messageLoop();
-	Console *_console;
+	GUI::Debugger *_debugger;
 	BaseGame *_game;
 	const ADGameDescription *_gameDescription;
-};
 
-// Example console class
-class Console : public GUI::Debugger {
-public:
-	Console(WintermuteEngine *vm) {}
-	virtual ~Console(void) {}
+	friend class Console;
 };
 
 } // End of namespace Wintermute