From f21ffdca330c362b46837c5fb32e68942f2a2fd2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 8 Feb 2020 21:19:26 -0800 Subject: [PATCH] DREAMWEB: Refactor to use Engine debugger --- engines/dreamweb/dreamweb.cpp | 9 +-------- engines/dreamweb/dreamweb.h | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index 76db211724b..de2e4647bb5 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -49,7 +49,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam DebugMan.addDebugChannel(kDebugAnimation, "Animation", "Animation Debug Flag"); DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Track Save/Load Function"); - _console = 0; _sound = 0; _speed = 1; _turbo = false; @@ -270,7 +269,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam DreamWebEngine::~DreamWebEngine() { DebugMan.clearAllDebugChannels(); - delete _console; delete _sound; } @@ -321,11 +319,6 @@ void DreamWebEngine::processEvents(bool processSoundEvents) { if (event.kbd.flags & Common::KBD_CTRL) { switch (event.kbd.keycode) { - case Common::KEYCODE_d: - _console->attach(); - _console->onFrame(); - break; - case Common::KEYCODE_f: setSpeed(_speed != 20? 20: 1); break; @@ -399,7 +392,7 @@ void DreamWebEngine::processEvents(bool processSoundEvents) { Common::Error DreamWebEngine::run() { syncSoundSettings(); - _console = new DreamWebConsole(this); + setDebugger(new DreamWebConsole(this)); _sound = new DreamWebSound(this); _hasSpeech = Common::File::exists(_speechDirName + "/r01c0000.raw") && !ConfMan.getBool("speech_mute"); diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 7e36a1dc1fd..7c09f4dc74a 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -100,7 +100,6 @@ class DreamWebSound; class DreamWebEngine : public Engine { private: - DreamWebConsole *_console; DreamWebSound *_sound; protected: @@ -108,8 +107,6 @@ protected: Common::Error run() override; bool hasFeature(EngineFeature f) const override; - GUI::Debugger *getDebugger() override { return _console; } - public: DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc); ~DreamWebEngine() override;