diff --git a/LEGO1/mxaudiomanager.cpp b/LEGO1/mxaudiomanager.cpp index 05cea8bf..c2141b38 100644 --- a/LEGO1/mxaudiomanager.cpp +++ b/LEGO1/mxaudiomanager.cpp @@ -1,5 +1,7 @@ #include "mxaudiomanager.h" +DECOMP_SIZE_ASSERT(MxAudioManager, 0x30); + // OFFSET: LEGO1 0x100b8d00 MxAudioManager::MxAudioManager() { @@ -9,7 +11,7 @@ MxAudioManager::MxAudioManager() // OFFSET: LEGO1 0x100b8d90 MxAudioManager::~MxAudioManager() { - LockedReinitialize(1); + LockedReinitialize(TRUE); } // OFFSET: LEGO1 0x100b8df0 @@ -19,13 +21,13 @@ void MxAudioManager::Init() } // OFFSET: LEGO1 0x100b8e00 -void MxAudioManager::LockedReinitialize(MxS8 p_skipTeardown) +void MxAudioManager::LockedReinitialize(MxBool p_doTeardown) { this->m_criticalSection.Enter(); Init(); this->m_criticalSection.Leave(); - if (!p_skipTeardown) { + if (p_doTeardown) { Teardown(); } } @@ -33,5 +35,5 @@ void MxAudioManager::LockedReinitialize(MxS8 p_skipTeardown) // OFFSET: LEGO1 0x100b8e90 void MxAudioManager::Reinitialize() { - LockedReinitialize(0); + LockedReinitialize(FALSE); } \ No newline at end of file diff --git a/LEGO1/mxaudiomanager.h b/LEGO1/mxaudiomanager.h index 21286899..232e441f 100644 --- a/LEGO1/mxaudiomanager.h +++ b/LEGO1/mxaudiomanager.h @@ -1,6 +1,7 @@ #ifndef MXAUDIOMANAGER_H #define MXAUDIOMANAGER_H +#include "decomp.h" #include "mxmediamanager.h" // VTABLE 0x100dc6e0 @@ -10,12 +11,15 @@ class MxAudioManager : public MxMediaManager MxAudioManager(); virtual ~MxAudioManager() override; - void LockedReinitialize(MxS8); void Reinitialize(); + +private: + void LockedReinitialize(MxBool); + protected: void Init(); - int m_unk2c; + undefined4 m_unk2c; }; #endif // MXAUDIOMANAGER_H