mirror of
https://github.com/scummvm/scummvm.git
synced 2026-11-18 21:34:48 +00:00
ULTIMA8: Cleanup singletons to fix shutdown and implement return to launcher event
This commit is contained in:
1 parent
ec8ea8bfad
commit
4e67a5ef82
7 files changed
+15
-4
No files matched your search
@@ -61,6 +61,8 @@ void AudioMixer::createProcesses() {
|
||||
}
|
||||
|
||||
AudioMixer::~AudioMixer(void) {
|
||||
_audioMixer = nullptr;
|
||||
|
||||
debugN(MM_INFO, "Destroying AudioMixer...\n");
|
||||
|
||||
closeMidiOutput();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -46,6 +46,7 @@ protected:
|
||||
|
||||
public:
|
||||
MusicProcess();
|
||||
~MusicProcess() override;
|
||||
|
||||
// p_dynamic_cast stuff
|
||||
ENABLE_RUNTIME_CLASSTYPE()
|
||||
|
||||
@@ -50,9 +50,6 @@ public:
|
||||
ProcId playEndgameMovie(bool fade) override;
|
||||
void playCredits() override;
|
||||
void playQuotes() override { };
|
||||
|
||||
protected:
|
||||
static Game *_game;
|
||||
};
|
||||
|
||||
} // End of namespace Ultima8
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -129,6 +129,7 @@ public:
|
||||
static Mouse *get_instance() { return _instance; }
|
||||
public:
|
||||
Mouse();
|
||||
~Mouse();
|
||||
|
||||
/**
|
||||
* Setup the mouse cursors
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in new issue
Block a user