From 34f9fc9ddcd1d006ccd5d47d361fba984d647e82 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 21 Oct 2023 18:33:39 -0400 Subject: [PATCH] Fix virtual function declarations --- LEGO1/mxsoundpresenter.cpp | 22 ++++++++++++---------- LEGO1/mxsoundpresenter.h | 5 +++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/LEGO1/mxsoundpresenter.cpp b/LEGO1/mxsoundpresenter.cpp index c461678e..8204c01c 100644 --- a/LEGO1/mxsoundpresenter.cpp +++ b/LEGO1/mxsoundpresenter.cpp @@ -14,30 +14,32 @@ MxSoundPresenter::~MxSoundPresenter() // OFFSET: LEGO1 0x100b1a50 void MxSoundPresenter::Destroy(MxBool p_fromDestructor) { - if(MSoundManager()) { - MSoundManager()->RemovePresenter(*this); - } + if (MSoundManager()) + MSoundManager()->RemovePresenter(*this); + this->m_criticalSection.Enter(); MxMediaPresenter::Init(); this->m_criticalSection.Leave(); - if(p_fromDestructor == FALSE) { - MxMediaPresenter::Destroy(FALSE); - } + + if (!p_fromDestructor) + MxMediaPresenter::Destroy(FALSE); } // OFFSET: LEGO1 0x100b1aa0 MxResult MxSoundPresenter::AddToManager() { MxResult ret = FAILURE; - if(MSoundManager()) { - ret = SUCCESS; - MSoundManager()->AddPresenter(*this); + + if (MSoundManager()) { + ret = SUCCESS; + MSoundManager()->AddPresenter(*this); } + return ret; } // OFFSET: LEGO1 0x1000d490 -void MxSoundPresenter::vtable38() +void MxSoundPresenter::Destroy() { Destroy(FALSE); } diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/mxsoundpresenter.h index 4b3ffbd6..a63083af 100644 --- a/LEGO1/mxsoundpresenter.h +++ b/LEGO1/mxsoundpresenter.h @@ -23,8 +23,9 @@ class MxSoundPresenter : public MxAudioPresenter return !strcmp(name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(name); }; - virtual MxResult AddToManager(); // vtable+0x34 - virtual void vtable38(); // vtable+0x38 + virtual MxResult AddToManager() override; // vtable+0x34 + virtual void Destroy() override; // vtable+0x38 + private: void Destroy(MxBool); };