isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-27 18:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some vtable declarations, more renames

Browse Source
This commit is contained in:
Christian Semmler 2023-10-13 12:22:10 -04:00
parent 362db6423b
commit 7d4c581bf5
10 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/mxaudiomanager.cpp
View File

@ -14,7 +14,7 @@ MxAudioManager::MxAudioManager()
// OFFSET: LEGO1 0x100b8d90 // OFFSET: LEGO1 0x100b8d90
MxAudioManager::~MxAudioManager() MxAudioManager::~MxAudioManager()
{ {
LockedReinitialize(TRUE); Destroy(TRUE);
} }
// OFFSET: LEGO1 0x100b8df0 // OFFSET: LEGO1 0x100b8df0
@ -38,14 +38,14 @@ void MxAudioManager::SetVolume(MxS32 p_volume)
} }
// OFFSET: LEGO1 0x100b8e00 // OFFSET: LEGO1 0x100b8e00
void MxAudioManager::LockedReinitialize(MxBool p_skipDestroy) void MxAudioManager::Destroy(MxBool p_fromDestructor)
{ {
this->m_criticalSection.Enter(); this->m_criticalSection.Enter();
g_unkCount--; g_unkCount--;
Init(); Init();
this->m_criticalSection.Leave(); this->m_criticalSection.Leave();
if (!p_skipDestroy) if (!p_fromDestructor)
MxMediaManager::Destroy(); MxMediaManager::Destroy();
} }
@ -74,5 +74,5 @@ MxResult MxAudioManager::InitPresenters()
// OFFSET: LEGO1 0x100b8e90 // OFFSET: LEGO1 0x100b8e90
void MxAudioManager::Destroy() void MxAudioManager::Destroy()
{ {
LockedReinitialize(FALSE); Destroy(FALSE);
} }

2
LEGO1/mxaudiomanager.h
View File

@ -17,7 +17,7 @@ class MxAudioManager : public MxMediaManager
virtual void SetVolume(MxS32 p_volume); // vtable+2c virtual void SetVolume(MxS32 p_volume); // vtable+2c
private: private:
void LockedReinitialize(MxBool p_skipDestroy); void Destroy(MxBool p_fromDestructor);
static MxS32 g_unkCount; static MxS32 g_unkCount;

2
LEGO1/mxmusicpresenter.cpp
View File

@ -38,7 +38,7 @@ void MxMusicPresenter::Destroy(MxBool p_fromDestructor)
} }
// OFFSET: LEGO1 0x100c25a0 // OFFSET: LEGO1 0x100c25a0
MxResult MxMusicPresenter::AddToMusicManager() MxResult MxMusicPresenter::AddToManager()
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
if (MusicManager()) { if (MusicManager()) {

4
LEGO1/mxmusicpresenter.h
View File

@ -24,8 +24,8 @@ class MxMusicPresenter : public MxAudioPresenter
MxMusicPresenter(); MxMusicPresenter();
virtual ~MxMusicPresenter() override; virtual ~MxMusicPresenter() override;
virtual MxResult AddToMusicManager(); // vtable+0x34 virtual MxResult AddToManager() override; // vtable+0x34
virtual void Destroy(); // vtable+0x38 virtual void Destroy() override; // vtable+0x38
private: private:
void Init(); void Init();

13
LEGO1/mxpresenter.cpp
View File

@ -29,7 +29,6 @@ void MxPresenter::Init()
// OFFSET: LEGO1 0x100b4fc0 // OFFSET: LEGO1 0x100b4fc0
void MxPresenter::ParseExtra() void MxPresenter::ParseExtra()
{ {
MxAutoLocker lock(&m_criticalSection); MxAutoLocker lock(&m_criticalSection);
MxU32 len = m_action->GetExtraLength(); MxU32 len = m_action->GetExtraLength();
char *extraData = m_action->GetExtraData(); char *extraData = m_action->GetExtraData();
@ -47,15 +46,13 @@ void MxPresenter::ParseExtra()
strcpy(t_token, token); strcpy(t_token, token);
token = strtok(NULL, g_parseExtraTokens); token = strtok(NULL, g_parseExtraTokens);
int val = token ? atoi(token) : 0; MxS32 val = token ? atoi(token) : 0;
MxS32 result = MxOmni::GetInstance()->vtable0x30(t_token, val, this);
int result = MxOmni::GetInstance()->vtable0x30(t_token, val, this);
m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Parsed); m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Parsed);
if (result) if (result)
SendTo_unkPresenter(MxOmni::GetInstance()); SendTo_unkPresenter(MxOmni::GetInstance());
} }
} }
} }
@ -279,13 +276,13 @@ void MxPresenter::DoneTickle()
} }
// OFFSET: LEGO1 0x1000bf70 // OFFSET: LEGO1 0x1000bf70
undefined4 MxPresenter::VTable0x34() MxResult MxPresenter::AddToManager()
{ {
return 0; return SUCCESS;
} }
// OFFSET: LEGO1 0x1000bf80 // OFFSET: LEGO1 0x1000bf80
void MxPresenter::InitVirtual() void MxPresenter::Destroy()
{ {
Init(); Init();
} }

4
LEGO1/mxpresenter.h
View File

@ -56,8 +56,8 @@ class MxPresenter : public MxCore
__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30 __declspec(dllexport) virtual void ParseExtra(); // vtable+0x30
public: public:
virtual undefined4 VTable0x34(); // vtable+0x34 virtual MxResult AddToManager(); // vtable+0x34
virtual void InitVirtual(); // vtable+0x38 virtual void Destroy(); // vtable+0x38
__declspec(dllexport) virtual MxLong StartAction(MxStreamController *, MxDSAction *); // vtable+0x3c __declspec(dllexport) virtual MxLong StartAction(MxStreamController *, MxDSAction *); // vtable+0x3c
__declspec(dllexport) virtual void EndAction(); // vtable+0x40 __declspec(dllexport) virtual void EndAction(); // vtable+0x40
virtual void SetTickleState(TickleState p_tickleState); // vtable+0x44 virtual void SetTickleState(TickleState p_tickleState); // vtable+0x44

4
LEGO1/mxsoundmanager.cpp
View File

@ -24,7 +24,7 @@ void MxSoundManager::Init()
} }
// OFFSET: LEGO1 0x100ae840 // OFFSET: LEGO1 0x100ae840
void MxSoundManager::Destroy(MxBool p_param) void MxSoundManager::Destroy(MxBool p_fromDestructor)
{ {
if (this->m_thread) { if (this->m_thread) {
this->m_thread->Terminate(); this->m_thread->Terminate();
@ -43,7 +43,7 @@ void MxSoundManager::Destroy(MxBool p_param)
Init(); Init();
this->m_criticalSection.Leave(); this->m_criticalSection.Leave();
if (!p_param) { if (!p_fromDestructor) {
MxAudioManager::Destroy(); MxAudioManager::Destroy();
} }
} }

2
LEGO1/mxsoundmanager.h
View File

@ -20,7 +20,7 @@ class MxSoundManager : public MxAudioManager
private: private:
void Init(); void Init();
void Destroy(MxBool); void Destroy(MxBool p_fromDestructor);
undefined4 m_unk30; undefined4 m_unk30;
LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x34 LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x34

4
LEGO1/mxvideopresenter.cpp
View File

@ -33,7 +33,7 @@ MxVideoPresenter::~MxVideoPresenter()
} }
// OFFSET: LEGO1 0x1000c7a0 STUB // OFFSET: LEGO1 0x1000c7a0 STUB
void MxVideoPresenter::InitVirtual() void MxVideoPresenter::Destroy()
{ {
// TODO // TODO
} }
@ -71,7 +71,7 @@ void MxVideoPresenter::Init()
} }
// OFFSET: LEGO1 0x100b27b0 STUB // OFFSET: LEGO1 0x100b27b0 STUB
void MxVideoPresenter::Destroy(MxBool) void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
{ {
// TODO // TODO
} }

4
LEGO1/mxvideopresenter.h
View File

@ -31,9 +31,9 @@ class MxVideoPresenter : public MxMediaPresenter
} }
void Init(); void Init();
void Destroy(MxBool); void Destroy(MxBool p_fromDestructor);
virtual void InitVirtual() override; // vtable+0x38 virtual void Destroy() override; // vtable+0x38
virtual void VTable0x5c(); // vtable+0x5c virtual void VTable0x5c(); // vtable+0x5c
virtual void VTable0x60(); // vtable+0x60 virtual void VTable0x60(); // vtable+0x60