From 4e67a5ef82a9e711076dddfd28c6b24d5c4fe41d Mon Sep 17 00:00:00 2001 From: Matthew Jimenez Date: Mon, 15 Jun 2020 18:52:53 -0500 Subject: [PATCH] ULTIMA8: Cleanup singletons to fix shutdown and implement return to launcher event --- engines/ultima/ultima8/audio/audio_mixer.cpp | 2 ++ engines/ultima/ultima8/audio/music_process.cpp | 4 ++++ engines/ultima/ultima8/audio/music_process.h | 1 + engines/ultima/ultima8/games/remorse_game.h | 3 --- engines/ultima/ultima8/kernel/mouse.cpp | 6 +++++- engines/ultima/ultima8/kernel/mouse.h | 1 + engines/ultima/ultima8/ultima8.cpp | 2 ++ 7 files changed, 15 insertions(+), 4 deletions(-) diff --git a/engines/ultima/ultima8/audio/audio_mixer.cpp b/engines/ultima/ultima8/audio/audio_mixer.cpp index 1add430ecb4..f660fb58742 100644 --- a/engines/ultima/ultima8/audio/audio_mixer.cpp +++ b/engines/ultima/ultima8/audio/audio_mixer.cpp @@ -61,6 +61,8 @@ void AudioMixer::createProcesses() { } AudioMixer::~AudioMixer(void) { + _audioMixer = nullptr; + debugN(MM_INFO, "Destroying AudioMixer...\n"); closeMidiOutput(); diff --git a/engines/ultima/ultima8/audio/music_process.cpp b/engines/ultima/ultima8/audio/music_process.cpp index 07c04a096e0..243fdfca586 100644 --- a/engines/ultima/ultima8/audio/music_process.cpp +++ b/engines/ultima/ultima8/audio/music_process.cpp @@ -41,6 +41,10 @@ MusicProcess::MusicProcess() { setRunPaused(); } +MusicProcess::~MusicProcess() { + _theMusicProcess = nullptr; +} + uint32 MusicProcess::I_musicStop(const uint8 * /*args*/, unsigned int /*argsize*/) { if (_theMusicProcess) _theMusicProcess->playMusic_internal(0); diff --git a/engines/ultima/ultima8/audio/music_process.h b/engines/ultima/ultima8/audio/music_process.h index 51318d8ba10..9b2b4d503ed 100644 --- a/engines/ultima/ultima8/audio/music_process.h +++ b/engines/ultima/ultima8/audio/music_process.h @@ -46,6 +46,7 @@ protected: public: MusicProcess(); + ~MusicProcess() override; // p_dynamic_cast stuff ENABLE_RUNTIME_CLASSTYPE() diff --git a/engines/ultima/ultima8/games/remorse_game.h b/engines/ultima/ultima8/games/remorse_game.h index 30012acedc5..478b4add6c7 100644 --- a/engines/ultima/ultima8/games/remorse_game.h +++ b/engines/ultima/ultima8/games/remorse_game.h @@ -50,9 +50,6 @@ public: ProcId playEndgameMovie(bool fade) override; void playCredits() override; void playQuotes() override { }; - -protected: - static Game *_game; }; } // End of namespace Ultima8 diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp index a2813973040..d2a1933305a 100644 --- a/engines/ultima/ultima8/kernel/mouse.cpp +++ b/engines/ultima/ultima8/kernel/mouse.cpp @@ -37,7 +37,7 @@ namespace Ultima { namespace Ultima8 { -Mouse *Mouse::_instance; +Mouse *Mouse::_instance = nullptr; Mouse::Mouse() : _flashingCursorTime(0), _mouseOverGump(0), _defaultMouse(nullptr), _dragging(DRAG_NOT), _dragging_objId(0), _draggingItem_startGump(0), @@ -45,6 +45,10 @@ Mouse::Mouse() : _flashingCursorTime(0), _mouseOverGump(0), _defaultMouse(nullpt _instance = this; } +Mouse::~Mouse() { + _instance = nullptr; +} + void Mouse::setup() { FileSystem *filesys = FileSystem::get_instance(); Common::SeekableReadStream *dm = filesys->ReadFile("@data/mouse.tga"); diff --git a/engines/ultima/ultima8/kernel/mouse.h b/engines/ultima/ultima8/kernel/mouse.h index 1e58c036457..c92fa158a87 100644 --- a/engines/ultima/ultima8/kernel/mouse.h +++ b/engines/ultima/ultima8/kernel/mouse.h @@ -129,6 +129,7 @@ public: static Mouse *get_instance() { return _instance; } public: Mouse(); + ~Mouse(); /** * Setup the mouse cursors diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp index b1ca9b37192..e3970850834 100644 --- a/engines/ultima/ultima8/ultima8.cpp +++ b/engines/ultima/ultima8/ultima8.cpp @@ -378,6 +378,7 @@ void Ultima8Engine::shutdownGame(bool reloading) { if (_audioMixer) { _audioMixer->closeMidiOutput(); _audioMixer->reset(); + FORGET_OBJECT(_audioMixer); } _desktopGump = nullptr; @@ -730,6 +731,7 @@ void Ultima8Engine::handleEvent(const Common::Event &event) { return; case Common::EVENT_QUIT: + case Common::EVENT_RETURN_TO_LAUNCHER: _isRunning = false; break;