* Added virtual Engine::getDebugger() method

* Removed code from errorString() methods that hooked the debugger(s)
  into error(), in favor of using getDebugger() from within error()
* As a consequence, removed most custom errorString() methods

svn-id: r23894

2 files changed, 3 insertions, 21 deletions

diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index df854bf5fe..c19945d332 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -48,10 +48,6 @@
 
 #include "sound/mididrv.h"
 
-#ifdef _WIN32_WCE
-bool isSmartphone();
-#endif
-
 /* Flight of the Amazon Queen */
 static const PlainGameDescriptor queen_setting[] = {
 	{ "queen", "Flight of the Amazon Queen" },
@@ -352,22 +348,8 @@ void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) {
 	}
 }
 
-void QueenEngine::errorString(const char *buf1, char *buf2) {
-	strcpy(buf2, buf1);
-
-#ifdef _WIN32_WCE
-	if (isSmartphone())
-		return;
-#endif
-
-	// Unless an error -originated- within the debugger, spawn the
-	// debugger. Otherwise exit out normally.
-	if (_debugger && !_debugger->isAttached()) {
-		// (Print it again in case debugger segfaults)
-		printf("%s\n", buf2);
-		_debugger->attach(buf2);
-		_debugger->onFrame();
-	}
+GUI::Debugger *QueenEngine::getDebugger() {
+	return _debugger;
 }
 
 int QueenEngine::go() {
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index a1f8b45aa9..5bd697f40a 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -130,7 +130,7 @@ public:
 
 protected:
 
-	void errorString(const char *buf_input, char *buf_output);
+	GUI::Debugger *getDebugger();
 
 	int go();
 	int init();