Fix virtual function declarations

This commit is contained in:
Christian Semmler 2023-10-21 18:33:39 -04:00
parent 40dbdbd10f
commit 34f9fc9ddc
2 changed files with 15 additions and 12 deletions

View File

@ -14,30 +14,32 @@ MxSoundPresenter::~MxSoundPresenter()
// OFFSET: LEGO1 0x100b1a50 // OFFSET: LEGO1 0x100b1a50
void MxSoundPresenter::Destroy(MxBool p_fromDestructor) void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
{ {
if(MSoundManager()) { if (MSoundManager())
MSoundManager()->RemovePresenter(*this); MSoundManager()->RemovePresenter(*this);
}
this->m_criticalSection.Enter(); this->m_criticalSection.Enter();
MxMediaPresenter::Init(); MxMediaPresenter::Init();
this->m_criticalSection.Leave(); this->m_criticalSection.Leave();
if(p_fromDestructor == FALSE) {
MxMediaPresenter::Destroy(FALSE); if (!p_fromDestructor)
} MxMediaPresenter::Destroy(FALSE);
} }
// OFFSET: LEGO1 0x100b1aa0 // OFFSET: LEGO1 0x100b1aa0
MxResult MxSoundPresenter::AddToManager() MxResult MxSoundPresenter::AddToManager()
{ {
MxResult ret = FAILURE; MxResult ret = FAILURE;
if(MSoundManager()) {
ret = SUCCESS; if (MSoundManager()) {
MSoundManager()->AddPresenter(*this); ret = SUCCESS;
MSoundManager()->AddPresenter(*this);
} }
return ret; return ret;
} }
// OFFSET: LEGO1 0x1000d490 // OFFSET: LEGO1 0x1000d490
void MxSoundPresenter::vtable38() void MxSoundPresenter::Destroy()
{ {
Destroy(FALSE); Destroy(FALSE);
} }

View File

@ -23,8 +23,9 @@ class MxSoundPresenter : public MxAudioPresenter
return !strcmp(name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(name); return !strcmp(name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(name);
}; };
virtual MxResult AddToManager(); // vtable+0x34 virtual MxResult AddToManager() override; // vtable+0x34
virtual void vtable38(); // vtable+0x38 virtual void Destroy() override; // vtable+0x38
private: private:
void Destroy(MxBool); void Destroy(MxBool);
}; };