From 1d4c82885ddcc0442671c863eef643aef2dc7dda Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 17 Jul 2010 18:38:42 +0000
Subject: DEBUGGER: Simplify how our console debugger works / is used

* Remove _isAttached member var and isAttached method
* Engines now always call the onFrame method; whether it does
  something is decided by the debugger class resp. its subclasses
* Make detach() protected instead of private, so that subclasses
  can invoke it
* Remove _detach_now member var (call detach() instead).
* Rename _frame_countdown to _frameCountdown and properly
  document it.
* Add more doxygen comments
* Cleanup

svn-id: r50963
---
 engines/agi/agi.cpp     |  3 +--
 engines/agi/console.cpp |  9 ---------
 engines/agi/console.h   | 17 -----------------
 3 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'engines/agi')

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index ce8b5931af..789d6a2193 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -279,8 +279,7 @@ void AgiEngine::pollTimer() {
 
 	while ((dm = _tickTimer - _lastTickTimer) < 5) {
 		processEvents();
-		if (_console->isAttached())
-			_console->onFrame();
+		_console->onFrame();
 		_system->delayMillis(10);
 		_system->updateScreen();
 	}
diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp
index e881b092e3..e5942455e2 100644
--- a/engines/agi/console.cpp
+++ b/engines/agi/console.cpp
@@ -53,15 +53,6 @@ Console::Console(AgiEngine *vm) : GUI::Debugger() {
 	DCmd_Register("bt",         WRAP_METHOD(Console, Cmd_BT));
 }
 
-Console::~Console() {
-}
-
-void Console::preEnter() {
-}
-
-void Console::postEnter() {
-}
-
 bool Console::Cmd_SetVar(int argc, const char **argv) {
 	if (argc != 3) {
 		DebugPrintf("Usage: setvar <varnum> <value>\n");
diff --git a/engines/agi/console.h b/engines/agi/console.h
index e8eccbe50a..e79db42054 100644
--- a/engines/agi/console.h
+++ b/engines/agi/console.h
@@ -46,11 +46,6 @@ struct AgiDebug {
 class Console : public GUI::Debugger {
 public:
 	Console(AgiEngine *vm);
-	virtual ~Console();
-
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
 
 private:
 	bool Cmd_SetVar(int argc, const char **argv);
@@ -80,10 +75,6 @@ public:
 	PreAGI_Console(PreAgiEngine *vm);
 	virtual ~PreAGI_Console() {}
 
-protected:
-	virtual void preEnter() {}
-	virtual void postEnter() {}
-
 private:
 	PreAgiEngine *_vm;
 };
@@ -94,10 +85,6 @@ public:
 	Mickey_Console(PreAgiEngine *vm, Mickey *mickey);
 	virtual ~Mickey_Console() {}
 
-protected:
-	virtual void preEnter() {}
-	virtual void postEnter() {}
-
 private:
 	Mickey *_mickey;
 
@@ -112,10 +99,6 @@ public:
 	Winnie_Console(PreAgiEngine *vm, Winnie *winnie);
 	virtual ~Winnie_Console() {}
 
-protected:
-	virtual void preEnter() {}
-	virtual void postEnter() {}
-
 private:
 	Winnie *_winnie;
 
-- 
cgit v1.2.3