diff --git a/LEGO1/mxmediamanager.h b/LEGO1/mxmediamanager.h index 32e1543c..ccc3ec42 100644 --- a/LEGO1/mxmediamanager.h +++ b/LEGO1/mxmediamanager.h @@ -7,8 +7,6 @@ #include "mxpresenterlist.h" #include "mxtypes.h" -#include - // VTABLE 0x100dc6b0 // SIZE 0x2c class MxMediaManager : public MxCore diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/mxsoundmanager.cpp index 8737c771..16d504ce 100644 --- a/LEGO1/mxsoundmanager.cpp +++ b/LEGO1/mxsoundmanager.cpp @@ -26,23 +26,24 @@ void MxSoundManager::Init() // OFFSET: LEGO1 0x100ae840 void MxSoundManager::Destroy(MxBool p_param) { - if(this->m_thread) { + if (this->m_thread) { this->m_thread->Terminate(); delete this->m_thread; - } else { + } + else { TickleManager()->UnregisterClient(this); } this->m_criticalSection.Enter(); - if(this->m_dsBuffer) { + if (this->m_dsBuffer) { this->m_dsBuffer->Release(); } Init(); this->m_criticalSection.Leave(); - if(!p_param) { + if (!p_param) { MxAudioManager::Destroy(); } } \ No newline at end of file diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/mxsoundmanager.h index e4ee7221..d41c6fdb 100644 --- a/LEGO1/mxsoundmanager.h +++ b/LEGO1/mxsoundmanager.h @@ -4,9 +4,10 @@ #include "decomp.h" #include "mxaudiomanager.h" +#include + // VTABLE 0x100dc128 // SIZE 0x3c -// Base vtables are: MxCore -> 0x100dc6b0 -> MxAudioManager -> MxSoundManager class MxSoundManager : public MxAudioManager { public: @@ -16,8 +17,9 @@ class MxSoundManager : public MxAudioManager private: void Init(); void Destroy(MxBool); + undefined4 m_unk30; - LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x34 + LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x34 undefined m_unk35[4]; };