From 72d0d84be2868c0c6a96e924eb8a89850101eee5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert <dreammaster@scummvm.org>
Date: Sat, 8 Feb 2020 22:00:02 -0800
Subject: [PATCH] LAB: Refactor to use Engine debugger

---
 engines/lab/dispman.cpp  | 1 -
 engines/lab/eventman.cpp | 7 -------
 engines/lab/lab.cpp      | 4 +---
 engines/lab/lab.h        | 2 --
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index d642f2fed5a..1ff6ab1ce87 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -414,7 +414,6 @@ void DisplayMan::screenUpdate() {
 	_vm->_event->processInput();
 
 	_vm->_system->copyRectToScreen(_displayBuffer, _screenWidth, 0, 0, _screenWidth, _screenHeight);
-	_vm->_console->onFrame();
 	_vm->_system->updateScreen();
 }
 
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index 62e1f752026..8242d58c0dd 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -117,13 +117,6 @@ void EventManager::processInput() {
 			case Common::KEYCODE_RIGHTBRACKET:
 				_vm->changeVolume(1);
 				break;
-			case Common::KEYCODE_d:
-				if (event.kbd.hasFlags(Common::KBD_CTRL)) {
-					// Open debugger console
-					_vm->_console->attach();
-					continue;
-				}
-				// Intentional fall through
 			default:
 				_keyPressed = event.kbd;
 				break;
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index ee67d3a99d6..5584464d80b 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -90,7 +90,6 @@ LabEngine::LabEngine(OSystem *syst, const ADGameDescription *gameDesc)
 	_roomsFound = nullptr;
 	_specialLocks = nullptr;
 	_utils = nullptr;
-	_console = nullptr;
 	_journalBackImage = nullptr;
 
 	_lastTooLong = false;
@@ -154,7 +153,6 @@ LabEngine::~LabEngine() {
 	delete _graphics;
 	delete _specialLocks;
 	delete _utils;
-	delete _console;
 	delete _journalBackImage;
 }
 
@@ -172,7 +170,7 @@ Common::Error LabEngine::run() {
 	_anim = new Anim(this);
 	_specialLocks = new SpecialLocks(this);
 	_utils = new Utils(this);
-	_console = new Console(this);
+	setDebugger(new Console(this));
 	_journalBackImage = new Image(this);
 
 	go();
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index e33272be4b8..a72a99e61ce 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -199,8 +199,6 @@ public:
 	TextFont *_msgFont;
 	SpecialLocks *_specialLocks;
 	Utils *_utils;
-	Console *_console;
-	GUI::Debugger *getDebugger() override { return _console; }
 
 public:
 	LabEngine(OSystem *syst, const ADGameDescription *gameDesc);