From 6edc86a19b6060c9f0f257b05ff711b021910de4 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 7 Dec 2010 18:54:21 +0000
Subject: DEBUG: Let GUI::Debugger::preEnter and postEnter (un)pause the engine

svn-id: r54815
---
 engines/agi/console.cpp        |  1 +
 engines/agos/debugger.cpp      | 10 ----------
 engines/agos/debugger.h        |  5 +----
 engines/cine/console.cpp       |  6 ------
 engines/cine/console.h         |  4 ----
 engines/cruise/debugger.h      |  2 +-
 engines/draci/console.cpp      |  6 ------
 engines/draci/console.h        |  4 ----
 engines/drascula/console.cpp   |  6 ------
 engines/drascula/console.h     |  4 ----
 engines/gob/console.cpp        |  6 ------
 engines/gob/console.h          |  4 ----
 engines/hugo/console.cpp       |  6 ------
 engines/hugo/console.h         |  4 ----
 engines/kyra/debugger.cpp      | 10 ----------
 engines/kyra/debugger.h        |  3 ---
 engines/lure/debugger.h        |  2 +-
 engines/made/console.cpp       |  6 ------
 engines/made/console.h         |  4 ----
 engines/mohawk/console.cpp     | 25 -------------------------
 engines/mohawk/console.h       | 12 ------------
 engines/parallaction/debug.cpp |  2 ++
 engines/parallaction/debug.h   |  9 +++++----
 engines/queen/debug.cpp        |  3 +++
 engines/queen/debug.h          |  6 ++----
 engines/sci/console.h          |  6 ++++--
 engines/scumm/debugger.cpp     | 11 -----------
 engines/scumm/debugger.h       |  5 +----
 engines/sky/debug.cpp          |  3 ++-
 engines/sky/debug.h            |  3 ++-
 engines/sword1/console.cpp     |  6 ------
 engines/sword1/console.h       |  4 ----
 engines/sword2/console.h       |  7 ++++---
 engines/sword25/console.cpp    |  6 ------
 engines/sword25/console.h      |  4 ----
 engines/tinsel/debugger.h      |  9 +++++----
 engines/toon/console.cpp       |  6 ------
 engines/toon/console.h         |  4 ----
 engines/touche/console.cpp     |  6 ------
 engines/touche/console.h       |  4 ----
 engines/tucker/console.cpp     |  8 +-------
 engines/tucker/console.h       |  4 ----
 42 files changed, 35 insertions(+), 211 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp
index 370f48e018..f4b50c0909 100644
--- a/engines/agi/console.cpp
+++ b/engines/agi/console.cpp
@@ -26,6 +26,7 @@
 #include "agi/agi.h"
 #include "agi/opcodes.h"
 
+#include "agi/preagi.h"
 #include "agi/preagi_mickey.h"
 #include "agi/preagi_winnie.h"
 
diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp
index 2ba55f89a0..5f46a9bc93 100644
--- a/engines/agos/debugger.cpp
+++ b/engines/agos/debugger.cpp
@@ -53,16 +53,6 @@ Debugger::Debugger(AGOSEngine *vm)
 }
 
 
-void Debugger::preEnter() {
-	//_vm->_midi.pause(1);
-}
-
-
-void Debugger::postEnter() {
-	//_vm->_midi.pause(0);
-}
-
-
 bool Debugger::Cmd_DebugLevel(int argc, const char **argv) {
 	if (argc == 1) {
 		if (_vm->_debugMode == false)
diff --git a/engines/agos/debugger.h b/engines/agos/debugger.h
index a660bed4d0..43c04c67c2 100644
--- a/engines/agos/debugger.h
+++ b/engines/agos/debugger.h
@@ -37,12 +37,9 @@ public:
 	Debugger(AGOSEngine *vm);
 	virtual ~Debugger() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
 
-protected:
+private:
 	AGOSEngine *_vm;
 
-	virtual void preEnter();
-	virtual void postEnter();
-
 	bool Cmd_DebugLevel(int argc, const char **argv);
 	bool Cmd_PlayMusic(int argc, const char **argv);
 	bool Cmd_PlaySound(int argc, const char **argv);
diff --git a/engines/cine/console.cpp b/engines/cine/console.cpp
index 87633a2644..9a006bf25e 100644
--- a/engines/cine/console.cpp
+++ b/engines/cine/console.cpp
@@ -34,10 +34,4 @@ CineConsole::CineConsole(CineEngine *vm) : GUI::Debugger(), _vm(vm) {
 CineConsole::~CineConsole() {
 }
 
-void CineConsole::preEnter() {
-}
-
-void CineConsole::postEnter() {
-}
-
 } // End of namespace Cine
diff --git a/engines/cine/console.h b/engines/cine/console.h
index 256ec16ce6..2f24b3be46 100644
--- a/engines/cine/console.h
+++ b/engines/cine/console.h
@@ -37,10 +37,6 @@ public:
 	CineConsole(CineEngine *vm);
 	virtual ~CineConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	CineEngine *_vm;
 };
diff --git a/engines/cruise/debugger.h b/engines/cruise/debugger.h
index 2c5b2a906f..356acdbf84 100644
--- a/engines/cruise/debugger.h
+++ b/engines/cruise/debugger.h
@@ -35,7 +35,7 @@ public:
 	Debugger();
 	virtual ~Debugger() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
 
-protected:
+private:
 	bool cmd_hotspots(int argc, const char **argv);
 	bool cmd_items(int argc, const char **argv);
 };
diff --git a/engines/draci/console.cpp b/engines/draci/console.cpp
index 96e8e3ae05..304b421ac3 100644
--- a/engines/draci/console.cpp
+++ b/engines/draci/console.cpp
@@ -34,10 +34,4 @@ DraciConsole::DraciConsole(DraciEngine *vm) : GUI::Debugger(), _vm(vm) {
 DraciConsole::~DraciConsole() {
 }
 
-void DraciConsole::preEnter() {
-}
-
-void DraciConsole::postEnter() {
-}
-
 } // End of namespace Draci
diff --git a/engines/draci/console.h b/engines/draci/console.h
index 811e14e0be..9d463f2eb1 100644
--- a/engines/draci/console.h
+++ b/engines/draci/console.h
@@ -37,10 +37,6 @@ public:
 	DraciConsole(DraciEngine *vm);
 	virtual ~DraciConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	DraciEngine *_vm;
 };
diff --git a/engines/drascula/console.cpp b/engines/drascula/console.cpp
index d017468285..9d01675f7d 100644
--- a/engines/drascula/console.cpp
+++ b/engines/drascula/console.cpp
@@ -36,12 +36,6 @@ Console::Console(DrasculaEngine *vm) : GUI::Debugger(), _vm(vm) {
 Console::~Console() {
 }
 
-void Console::preEnter() {
-}
-
-void Console::postEnter() {
-}
-
 bool Console::Cmd_Room(int argc, const char **argv) {
 	if (argc < 2) {
 		DebugPrintf("Usage: changeCard <card>\n");
diff --git a/engines/drascula/console.h b/engines/drascula/console.h
index 33e2f626e4..d8d1918a60 100644
--- a/engines/drascula/console.h
+++ b/engines/drascula/console.h
@@ -37,10 +37,6 @@ public:
 	Console(DrasculaEngine *vm);
 	virtual ~Console(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	DrasculaEngine *_vm;
 
diff --git a/engines/gob/console.cpp b/engines/gob/console.cpp
index b6b481f611..751956a848 100644
--- a/engines/gob/console.cpp
+++ b/engines/gob/console.cpp
@@ -42,12 +42,6 @@ GobConsole::GobConsole(GobEngine *vm) : GUI::Debugger(), _vm(vm) {
 GobConsole::~GobConsole() {
 }
 
-void GobConsole::preEnter() {
-}
-
-void GobConsole::postEnter() {
-}
-
 bool GobConsole::cmd_varSize(int argc, const char **argv) {
 	DebugPrintf("Size of the variable space: %d bytes\n", _vm->_inter->_variables->getSize());
 	return true;
diff --git a/engines/gob/console.h b/engines/gob/console.h
index f51d74be86..9f726c6b92 100644
--- a/engines/gob/console.h
+++ b/engines/gob/console.h
@@ -37,10 +37,6 @@ public:
 	GobConsole(GobEngine *vm);
 	virtual ~GobConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	GobEngine *_vm;
 
diff --git a/engines/hugo/console.cpp b/engines/hugo/console.cpp
index 4c4f5934f8..3ff37ccbc7 100644
--- a/engines/hugo/console.cpp
+++ b/engines/hugo/console.cpp
@@ -34,10 +34,4 @@ HugoConsole::HugoConsole(HugoEngine *vm) : GUI::Debugger(), _vm(vm) {
 HugoConsole::~HugoConsole() {
 }
 
-void HugoConsole::preEnter() {
-}
-
-void HugoConsole::postEnter() {
-}
-
 } // End of namespace Hugo
diff --git a/engines/hugo/console.h b/engines/hugo/console.h
index f6c651459e..240b108ab6 100644
--- a/engines/hugo/console.h
+++ b/engines/hugo/console.h
@@ -37,10 +37,6 @@ public:
 	HugoConsole(HugoEngine *vm);
 	virtual ~HugoConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	HugoEngine *_vm;
 };
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index d58494303c..301271ad3c 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -53,16 +53,6 @@ Debugger::Debugger(KyraEngine_v1 *vm)
 	DCmd_Register("settimercountdown",	WRAP_METHOD(Debugger, cmd_setTimerCountdown));
 }
 
-void Debugger::preEnter() {
-	_vm->pauseEngine(true);
-	::GUI::Debugger::preEnter();
-}
-
-void Debugger::postEnter() {
-	::GUI::Debugger::postEnter();
-	_vm->pauseEngine(false);
-}
-
 bool Debugger::cmd_setScreenDebug(int argc, const char **argv) {
 	if (argc > 1) {
 		if (scumm_stricmp(argv[1], "enable") == 0)
diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h
index dfc2a26aa2..de45bd0aaa 100644
--- a/engines/kyra/debugger.h
+++ b/engines/kyra/debugger.h
@@ -41,9 +41,6 @@ public:
 	virtual ~Debugger() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
 
 protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 	KyraEngine_v1 *_vm;
 
 	bool cmd_setScreenDebug(int argc, const char **argv);
diff --git a/engines/lure/debugger.h b/engines/lure/debugger.h
index 4441c2a1dc..dd1d8b5fc6 100644
--- a/engines/lure/debugger.h
+++ b/engines/lure/debugger.h
@@ -35,7 +35,7 @@ public:
 	Debugger();
 	virtual ~Debugger() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
 
-protected:
+private:
 	bool cmd_enterRoom(int argc, const char **argv);
 	bool cmd_listRooms(int argc, const char **argv);
 	bool cmd_listFields(int argc, const char **argv);
diff --git a/engines/made/console.cpp b/engines/made/console.cpp
index ee85c465e8..abf849d560 100644
--- a/engines/made/console.cpp
+++ b/engines/made/console.cpp
@@ -34,10 +34,4 @@ MadeConsole::MadeConsole(MadeEngine *vm) : GUI::Debugger(), _vm(vm) {
 MadeConsole::~MadeConsole() {
 }
 
-void MadeConsole::preEnter() {
-}
-
-void MadeConsole::postEnter() {
-}
-
 } // End of namespace Made
diff --git a/engines/made/console.h b/engines/made/console.h
index 9f4632b986..6dc7541f53 100644
--- a/engines/made/console.h
+++ b/engines/made/console.h
@@ -37,10 +37,6 @@ public:
 	MadeConsole(MadeEngine *vm);
 	virtual ~MadeConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	MadeEngine *_vm;
 };
diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp
index 65479c555c..c995f8ca66 100644
--- a/engines/mohawk/console.cpp
+++ b/engines/mohawk/console.cpp
@@ -54,14 +54,6 @@ MystConsole::MystConsole(MohawkEngine_Myst *vm) : GUI::Debugger(), _vm(vm) {
 MystConsole::~MystConsole() {
 }
 
-void MystConsole::preEnter() {
-	_vm->_sound->pauseSound();
-}
-
-void MystConsole::postEnter() {
-	_vm->_sound->resumeSound();
-}
-
 bool MystConsole::Cmd_ChangeCard(int argc, const char **argv) {
 	if (argc < 2) {
 		DebugPrintf("Usage: changeCard <card>\n");
@@ -315,15 +307,6 @@ RivenConsole::RivenConsole(MohawkEngine_Riven *vm) : GUI::Debugger(), _vm(vm) {
 RivenConsole::~RivenConsole() {
 }
 
-void RivenConsole::preEnter() {
-	_vm->_sound->pauseSound();
-	_vm->_sound->pauseSLST();
-}
-
-void RivenConsole::postEnter() {
-	_vm->_sound->resumeSound();
-	_vm->_sound->resumeSLST();
-}
 
 bool RivenConsole::Cmd_ChangeCard(int argc, const char **argv) {
 	if (argc < 2) {
@@ -658,14 +641,6 @@ LivingBooksConsole::LivingBooksConsole(MohawkEngine_LivingBooks *vm) : GUI::Debu
 LivingBooksConsole::~LivingBooksConsole() {
 }
 
-void LivingBooksConsole::preEnter() {
-	_vm->_sound->pauseSound();
-}
-
-void LivingBooksConsole::postEnter() {
-	_vm->_sound->resumeSound();
-}
-
 bool LivingBooksConsole::Cmd_PlaySound(int argc, const char **argv) {
 	if (argc == 1) {
 		DebugPrintf("Usage: playSound <value>\n");
diff --git a/engines/mohawk/console.h b/engines/mohawk/console.h
index a79b63f6f2..f7f37f0211 100644
--- a/engines/mohawk/console.h
+++ b/engines/mohawk/console.h
@@ -39,10 +39,6 @@ public:
 	MystConsole(MohawkEngine_Myst *vm);
 	virtual ~MystConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	MohawkEngine_Myst *_vm;
 
@@ -66,10 +62,6 @@ public:
 	RivenConsole(MohawkEngine_Riven *vm);
 	virtual ~RivenConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	MohawkEngine_Riven *_vm;
 
@@ -97,10 +89,6 @@ public:
 	LivingBooksConsole(MohawkEngine_LivingBooks *vm);
 	virtual ~LivingBooksConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	MohawkEngine_LivingBooks *_vm;
 
diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp
index b5eb82b456..f9e80fa288 100644
--- a/engines/parallaction/debug.cpp
+++ b/engines/parallaction/debug.cpp
@@ -53,10 +53,12 @@ Debugger::Debugger(Parallaction *vm)
 
 void Debugger::preEnter() {
 	_mouseState = _vm->_input->getMouseState();
+	_vm->pauseEngine(true);
 }
 
 
 void Debugger::postEnter() {
+	_vm->pauseEngine(false);
 	_vm->_input->setMouseState(_mouseState);
 	_vm->_input->setArrowCursor();	// unselects the active item, if any
 }
diff --git a/engines/parallaction/debug.h b/engines/parallaction/debug.h
index 5267206d04..2f807b0e88 100644
--- a/engines/parallaction/debug.h
+++ b/engines/parallaction/debug.h
@@ -14,13 +14,14 @@ public:
 	Debugger(Parallaction *vm);
 	virtual ~Debugger() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
 
-protected:
-	Parallaction *_vm;
-	MouseTriState _mouseState;
-
+private:
 	virtual void preEnter();
 	virtual void postEnter();
 
+private:
+	Parallaction *_vm;
+	MouseTriState _mouseState;
+
 	bool Cmd_DebugLevel(int argc, const char **argv);
 	bool Cmd_Location(int argc, const char **argv);
 	bool Cmd_Give(int argc, const char **argv);
diff --git a/engines/queen/debug.cpp b/engines/queen/debug.cpp
index f4d7cf3b2e..a7cf70fbb2 100644
--- a/engines/queen/debug.cpp
+++ b/engines/queen/debug.cpp
@@ -50,10 +50,13 @@ Debugger::Debugger(QueenEngine *vm)
 }
 
 Debugger::~Debugger() {} // we need this here for __SYMBIAN32__
+
 void Debugger::preEnter() {
+	_vm->pauseEngine(true);
 }
 
 void Debugger::postEnter() {
+	_vm->pauseEngine(false);
 	_vm->graphics()->setupMouseCursor();
 }
 
diff --git a/engines/queen/debug.h b/engines/queen/debug.h
index 1b2d7582b3..9b08ce83e8 100644
--- a/engines/queen/debug.h
+++ b/engines/queen/debug.h
@@ -34,7 +34,6 @@ class QueenEngine;
 
 class Debugger : public GUI::Debugger {
 public:
-
 	Debugger(QueenEngine *vm);
 	virtual ~Debugger(); // we need this here for __SYMBIAN32__ archaic gcc/UIQ
 
@@ -44,11 +43,11 @@ public:
 		DF_DRAW_AREAS = 1 << 0
 	};
 
-protected:
-
+private:
 	virtual void preEnter();
 	virtual void postEnter();
 
+private:
 	bool Cmd_Areas(int argc, const char **argv);
 	bool Cmd_Asm(int argc, const char **argv);
 	bool Cmd_Bob(int argc, const char **argv);
@@ -60,7 +59,6 @@ protected:
 	bool Cmd_Song(int argc, const char **argv);
 
 private:
-
 	QueenEngine *_vm;
 	int _flags;
 };
diff --git a/engines/sci/console.h b/engines/sci/console.h
index d9f1408b41..6a6ecc8681 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -42,11 +42,13 @@ class Console : public GUI::Debugger {
 public:
 	Console(SciEngine *engine);
 	virtual ~Console();
-	void preEnter();
-	void postEnter();
 
 	int printObject(reg_t pos);
 
+private:
+	virtual void preEnter();
+	virtual void postEnter();
+
 private:
 	// General
 	bool cmdHelp(int argc, const char **argv);
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index a348d9c942..67a8abdec9 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -107,17 +107,6 @@ ScummDebugger::~ScummDebugger() {
 	 // we need this destructor, even if it is empty, for __SYMBIAN32__
 }
 
-void ScummDebugger::preEnter() {
-	// Pause sound output
-	_old_soundsPaused = _vm->_sound->_soundsPaused;
-	_vm->_sound->pauseSounds(true);
-}
-
-void ScummDebugger::postEnter() {
-	// Resume previous sound state
-	_vm->_sound->pauseSounds(_old_soundsPaused);
-}
-
 ///////////////////////////////////////////////////
 // Now the fun stuff:
 
diff --git a/engines/scumm/debugger.h b/engines/scumm/debugger.h
index 61d5ac480a..9a85493bbe 100644
--- a/engines/scumm/debugger.h
+++ b/engines/scumm/debugger.h
@@ -36,13 +36,10 @@ public:
 	ScummDebugger(ScummEngine *s);
 	virtual ~ScummDebugger(); // we need this here for __SYMBIAN32__
 
-protected:
+private:
 	ScummEngine *_vm;
 	bool  _old_soundsPaused;
 
-	virtual void preEnter();
-	virtual void postEnter();
-
 	// Commands
 	bool Cmd_Room(int argc, const char **argv);
 	bool Cmd_LoadGame(int argc, const char **argv);
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index b8a8926385..b43ec917fe 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -1103,10 +1103,11 @@ Debugger::Debugger(Logic *logic, Mouse *mouse, Screen *screen, SkyCompact *skyCo
 Debugger::~Debugger() {} // we need this here for __SYMBIAN32__
 
 void Debugger::preEnter() {
-
+	::GUI::Debugger::preEnter();
 }
 
 void Debugger::postEnter() {
+	::GUI::Debugger::postEnter();
 	_mouse->resetCursor();
 }
 
diff --git a/engines/sky/debug.h b/engines/sky/debug.h
index a248b23692..ff94cbc8ad 100644
--- a/engines/sky/debug.h
+++ b/engines/sky/debug.h
@@ -43,10 +43,11 @@ public:
 	virtual ~Debugger(); // we need this here for __SYMBIAN32__ archaic gcc/UIQ
 	bool showGrid()	{	return _showGrid; }
 
-protected:
+private:
 	virtual void preEnter();
 	virtual void postEnter();
 
+private:
 	bool Cmd_ShowGrid(int argc, const char **argv);
 	bool Cmd_ReloadGrid(int argc, const char **argv);
 	bool Cmd_ShowCompact(int argc, const char **argv);
diff --git a/engines/sword1/console.cpp b/engines/sword1/console.cpp
index 7a1c087dd5..79792c2208 100644
--- a/engines/sword1/console.cpp
+++ b/engines/sword1/console.cpp
@@ -34,10 +34,4 @@ SwordConsole::SwordConsole(SwordEngine *vm) : GUI::Debugger(), _vm(vm) {
 SwordConsole::~SwordConsole() {
 }
 
-void SwordConsole::preEnter() {
-}
-
-void SwordConsole::postEnter() {
-}
-
 } // End of namespace Sword
diff --git a/engines/sword1/console.h b/engines/sword1/console.h
index 09d197363e..7ee8d2935f 100644
--- a/engines/sword1/console.h
+++ b/engines/sword1/console.h
@@ -37,10 +37,6 @@ public:
 	SwordConsole(SwordEngine *vm);
 	virtual ~SwordConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	SwordEngine *_vm;
 };
diff --git a/engines/sword2/console.h b/engines/sword2/console.h
index 6cdee91ea0..2de8299780 100644
--- a/engines/sword2/console.h
+++ b/engines/sword2/console.h
@@ -82,12 +82,13 @@ public:
 	void buildDebugText();
 	void drawDebugGraphics();
 
-protected:
-	Sword2Engine *_vm;
-
+private:
 	virtual void preEnter();
 	virtual void postEnter();
 
+private:
+	Sword2Engine *_vm;
+
 	// Commands
 	bool Cmd_Mem(int argc, const char **argv);
 	bool Cmd_Tony(int argc, const char **argv);
diff --git a/engines/sword25/console.cpp b/engines/sword25/console.cpp
index 014c748182..902d9a5b72 100644
--- a/engines/sword25/console.cpp
+++ b/engines/sword25/console.cpp
@@ -34,10 +34,4 @@ Sword25Console::Sword25Console(Sword25Engine *vm) : GUI::Debugger(), _vm(vm) {
 Sword25Console::~Sword25Console() {
 }
 
-void Sword25Console::preEnter() {
-}
-
-void Sword25Console::postEnter() {
-}
-
 } // End of namespace Sword25
diff --git a/engines/sword25/console.h b/engines/sword25/console.h
index dd053c19f6..dcf8082d3c 100644
--- a/engines/sword25/console.h
+++ b/engines/sword25/console.h
@@ -37,10 +37,6 @@ public:
 	Sword25Console(Sword25Engine *vm);
 	virtual ~Sword25Console(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	Sword25Engine *_vm;
 };
diff --git a/engines/tinsel/debugger.h b/engines/tinsel/debugger.h
index e3e7e7cd48..e803f16566 100644
--- a/engines/tinsel/debugger.h
+++ b/engines/tinsel/debugger.h
@@ -33,15 +33,16 @@ namespace Tinsel {
 class TinselEngine;
 
 class Console: public GUI::Debugger {
-protected:
+public:
+	Console();
+	virtual ~Console();
+
+private:
 	bool cmd_item(int argc, const char **argv);
 	bool cmd_scene(int argc, const char **argv);
 	bool cmd_music(int argc, const char **argv);
 	bool cmd_sound(int argc, const char **argv);
 	bool cmd_string(int argc, const char **argv);
-public:
-	Console();
-	virtual ~Console();
 };
 
 } // End of namespace Tinsel
diff --git a/engines/toon/console.cpp b/engines/toon/console.cpp
index db50e28489..3c34792580 100644
--- a/engines/toon/console.cpp
+++ b/engines/toon/console.cpp
@@ -34,10 +34,4 @@ ToonConsole::ToonConsole(ToonEngine *vm) : GUI::Debugger(), _vm(vm) {
 ToonConsole::~ToonConsole() {
 }
 
-void ToonConsole::preEnter() {
-}
-
-void ToonConsole::postEnter() {
-}
-
 } // End of namespace Toon
diff --git a/engines/toon/console.h b/engines/toon/console.h
index 40b556e633..0662f20533 100644
--- a/engines/toon/console.h
+++ b/engines/toon/console.h
@@ -37,10 +37,6 @@ public:
 	ToonConsole(ToonEngine *vm);
 	virtual ~ToonConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	ToonEngine *_vm;
 };
diff --git a/engines/touche/console.cpp b/engines/touche/console.cpp
index 9d2b94d31c..adcabb2fc5 100644
--- a/engines/touche/console.cpp
+++ b/engines/touche/console.cpp
@@ -34,10 +34,4 @@ ToucheConsole::ToucheConsole(ToucheEngine *vm) : GUI::Debugger(), _vm(vm) {
 ToucheConsole::~ToucheConsole() {
 }
 
-void ToucheConsole::preEnter() {
-}
-
-void ToucheConsole::postEnter() {
-}
-
 } // End of namespace Touche
diff --git a/engines/touche/console.h b/engines/touche/console.h
index bcb947cf2e..de14867b32 100644
--- a/engines/touche/console.h
+++ b/engines/touche/console.h
@@ -37,10 +37,6 @@ public:
 	ToucheConsole(ToucheEngine *vm);
 	virtual ~ToucheConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	ToucheEngine *_vm;
 };
diff --git a/engines/tucker/console.cpp b/engines/tucker/console.cpp
index f06fd8fddb..34be3dd9fd 100644
--- a/engines/tucker/console.cpp
+++ b/engines/tucker/console.cpp
@@ -28,16 +28,10 @@
 
 namespace Tucker {
 
-TuckerConsole::TuckerConsole(TuckerEngine *vm) : GUI::Debugger(), _vm(vm) {
+TuckerConsole::TuckerConsole(TuckerEngine *vm) :  _vm(vm) {
 }
 
 TuckerConsole::~TuckerConsole() {
 }
 
-void TuckerConsole::preEnter() {
-}
-
-void TuckerConsole::postEnter() {
-}
-
 } // End of namespace Tucker
diff --git a/engines/tucker/console.h b/engines/tucker/console.h
index 2449fa3279..fe91c1bb70 100644
--- a/engines/tucker/console.h
+++ b/engines/tucker/console.h
@@ -37,10 +37,6 @@ public:
 	TuckerConsole(TuckerEngine *vm);
 	virtual ~TuckerConsole(void);
 
-protected:
-	virtual void preEnter();
-	virtual void postEnter();
-
 private:
 	TuckerEngine *_vm;
 };
-- 
cgit v1.2.3