From afa27aa7c5c3fa42329a6f37b78638f53e1a2b24 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 8 Feb 2020 22:05:12 -0800 Subject: [PATCH] LILLIPUT: Refactor to use Engine debugger --- engines/lilliput/lilliput.cpp | 7 +------ engines/lilliput/lilliput.h | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index eaf3e5ffd46..cec5a8417f2 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -116,7 +116,7 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd) DebugMan.addDebugChannel(kDebugEngineTBC, "EngineTBC", "Engine debug level"); DebugMan.addDebugChannel(kDebugScriptTBC, "ScriptTBC", "Script debug level"); - _console = new LilliputConsole(this); + setDebugger(new LilliputConsole(this)); _rnd = 0; _mousePos = Common::Point(0, 0); _oldMousePos = Common::Point(0, 0); @@ -263,16 +263,11 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd) LilliputEngine::~LilliputEngine() { DebugMan.clearAllDebugChannels(); - delete _console; delete _soundHandler; delete _scriptHandler; delete _rnd; } -GUI::Debugger *LilliputEngine::getDebugger() { - return _console; -} - void LilliputEngine::update() { // update every 20 ms. int currentTime = _system->getMillis(); diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h index 804e5f8043e..3921b5fda17 100644 --- a/engines/lilliput/lilliput.h +++ b/engines/lilliput/lilliput.h @@ -94,8 +94,6 @@ public: OSystem *_system; - GUI::Debugger *getDebugger() override; - Common::RandomSource *_rnd; LilliputScript *_scriptHandler; LilliputSound *_soundHandler; @@ -372,7 +370,6 @@ protected: private: static LilliputEngine *s_Engine; - LilliputConsole *_console; GameType _gameType; Common::Platform _platform;