From c99c1879835dac7bffab3700570e01b19c09d916 Mon Sep 17 00:00:00 2001
From: Paul Gilbert <dreammaster@scummvm.org>
Date: Sat, 8 Feb 2020 21:31:55 -0800
Subject: [PATCH] GOB: Refactor to use Engine debugger

---
 engines/gob/gob.cpp                          | 4 ++--
 engines/gob/gob.h                            | 2 --
 engines/gob/minigames/geisha/penetration.cpp | 4 ----
 engines/gob/util.cpp                         | 4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index a936f29e19f..23b6669d260 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -150,12 +150,12 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst), _rnd("gob") {
 	_copyProtection = ConfMan.getBool("copy_protection");
 
 	_console = new GobConsole(this);
+	setDebugger(_console);
 }
 
 GobEngine::~GobEngine() {
 	deinitGameParts();
-
-	delete _console;
+	//_console is deleted by Engine
 }
 
 const char *GobEngine::getLangDesc(int16 language) const {
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 18fa0028be1..b5287b85cb9 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -257,8 +257,6 @@ public:
 
 	void setTrueColor(bool trueColor);
 
-	GUI::Debugger *getDebugger() override { return _console; }
-
 	const Graphics::PixelFormat &getPixelFormat() const;
 
 	GobEngine(OSystem *syst);
diff --git a/engines/gob/minigames/geisha/penetration.cpp b/engines/gob/minigames/geisha/penetration.cpp
index a69d998ffd1..549dfc6e2e9 100644
--- a/engines/gob/minigames/geisha/penetration.cpp
+++ b/engines/gob/minigames/geisha/penetration.cpp
@@ -983,10 +983,6 @@ void Penetration::checkInput() {
 				_keys[kKeyRight] = true;
 			else if (event.kbd.keycode == Common::KEYCODE_SPACE)
 				_keys[kKeySpace] = true;
-			else if (event.kbd.keycode == Common::KEYCODE_d) {
-				_vm->getDebugger()->attach();
-				_vm->getDebugger()->onFrame();
-			}
 			break;
 
 		case Common::EVENT_KEYUP:
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 8ca8e03b9ba..19840d8c987 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -126,10 +126,6 @@ void Util::processInput(bool scroll) {
 					_fastMode ^= 2;
 				else if (event.kbd.keycode == Common::KEYCODE_p)
 					_vm->pauseGame();
-				else if (event.kbd.keycode == Common::KEYCODE_d) {
-					_vm->getDebugger()->attach();
-					_vm->getDebugger()->onFrame();
-				}
 				break;
 			}
 			addKeyToBuffer(event.kbd);