thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Refactor to use Engine debugger

Browse source
This commit is contained in:
Paul Gilbert 2020-02-08 22:14:55 -08:00 • committed by Filippos Karapetis
parent 87406e66b7
commit 3487af4b9c
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/mads/events.cpp
View file

@ -152,13 +152,7 @@ void EventsManager::pollEvents() {
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
// Check for debugger // Check for debugger
if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL)) { _pendingKeys.push(event.kbd);
// Attach to the debugger
_vm->_debugger->attach();
_vm->_debugger->onFrame();
} else {
_pendingKeys.push(event.kbd);
}
return; return;
case Common::EVENT_KEYUP: case Common::EVENT_KEYUP:
return; return;
@ -213,15 +207,9 @@ bool EventsManager::checkForNextFrameCounter() {
// Do any palette cycling // Do any palette cycling
_vm->_game->_scene.animatePalette(); _vm->_game->_scene.animatePalette();
// Give time to the debugger
_vm->_debugger->onFrame();
// Display the frame // Display the frame
_vm->_screen->update(); _vm->_screen->update();
// Signal the ScummVM debugger
_vm->_debugger->onFrame();
return true; return true;
} }

4
engines/mads/mads.cpp
View file

@ -53,7 +53,6 @@ MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
_dithering = false; _dithering = false;
_disableFastwalk = false; _disableFastwalk = false;
_debugger = nullptr;
_dialogs = nullptr; _dialogs = nullptr;
_events = nullptr; _events = nullptr;
_font = nullptr; _font = nullptr;
@ -67,7 +66,6 @@ MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
} }
MADSEngine::~MADSEngine() { MADSEngine::~MADSEngine() {
delete _debugger;
delete _dialogs; delete _dialogs;
delete _events; delete _events;
delete _font; delete _font;
@ -78,6 +76,7 @@ MADSEngine::~MADSEngine() {
delete _resources; delete _resources;
delete _sound; delete _sound;
delete _audio; delete _audio;
//_debugger Debugger is deleted by Engine
_mixer->stopAll(); _mixer->stopAll();
} }
@ -90,6 +89,7 @@ void MADSEngine::initialize() {
Resources::init(this); Resources::init(this);
Conversation::init(this); Conversation::init(this);
_debugger = new Debugger(this); _debugger = new Debugger(this);
setDebugger(_debugger);
_dialogs = Dialogs::init(this); _dialogs = Dialogs::init(this);
_events = new EventsManager(this); _events = new EventsManager(this);
_palette = new Palette(this); _palette = new Palette(this);