diff --git a/LEGO1/lego/legoomni/include/legocachesoundmanager.h b/LEGO1/lego/legoomni/include/legocachesoundmanager.h index 25ee34ed..dd9df741 100644 --- a/LEGO1/lego/legoomni/include/legocachesoundmanager.h +++ b/LEGO1/lego/legoomni/include/legocachesoundmanager.h @@ -58,7 +58,7 @@ class LegoCacheSoundManager { LegoCacheSound* ManageSoundEntry(LegoCacheSound* p_sound); LegoCacheSound* Play(const char* p_key, const char* p_name, MxBool p_looping); LegoCacheSound* Play(LegoCacheSound* p_sound, const char* p_name, MxBool p_looping); - void FUN_1003db80(LegoCacheSound*& p_sound); + void Stop(LegoCacheSound*& p_sound); void Destroy(LegoCacheSound*& p_sound); private: diff --git a/LEGO1/lego/legoomni/include/legocachsound.h b/LEGO1/lego/legoomni/include/legocachsound.h index 593be9d2..196bfb55 100644 --- a/LEGO1/lego/legoomni/include/legocachsound.h +++ b/LEGO1/lego/legoomni/include/legocachsound.h @@ -41,7 +41,7 @@ class LegoCacheSound : public MxCore { LegoCacheSound* Clone(); MxResult Play(const char* p_name, MxBool p_looping); - void FUN_10006b80(); + void Stop(); void FUN_10006be0(); void SetDistance(MxS32 p_min, MxS32 p_max); void Mute(MxBool p_mute); diff --git a/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp index 36816733..6338b281 100644 --- a/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp @@ -14,14 +14,14 @@ LegoCacheSoundManager::~LegoCacheSoundManager() while (!m_set.empty()) { sound = (*m_set.begin()).GetSound(); m_set.erase(m_set.begin()); - sound->FUN_10006b80(); + sound->Stop(); delete sound; } while (!m_list.empty()) { sound = (*m_list.begin()).GetSound(); m_list.erase(m_list.begin()); - sound->FUN_10006b80(); + sound->Stop(); // DECOMP: delete should not be inlined here delete sound; } @@ -51,7 +51,7 @@ MxResult LegoCacheSoundManager::Tickle() listIter++; } else { - sound->FUN_10006b80(); + sound->Stop(); m_list.erase(listIter++); delete sound; } @@ -134,7 +134,7 @@ LegoCacheSound* LegoCacheSoundManager::Play(LegoCacheSound* p_sound, const char* // FUNCTION: LEGO1 0x1003db80 // FUNCTION: BETA10 0x100656a7 -void LegoCacheSoundManager::FUN_1003db80(LegoCacheSound*& p_sound) +void LegoCacheSoundManager::Stop(LegoCacheSound*& p_sound) { #ifdef COMPAT_MODE Set100d6b4c::iterator setIter; @@ -143,7 +143,7 @@ void LegoCacheSoundManager::FUN_1003db80(LegoCacheSound*& p_sound) for (Set100d6b4c::iterator setIter = m_set.begin(); setIter != m_set.end(); setIter++) { #endif if ((*setIter).GetSound() == p_sound) { - p_sound->FUN_10006b80(); + p_sound->Stop(); return; } } @@ -160,7 +160,7 @@ void LegoCacheSoundManager::FUN_1003db80(LegoCacheSound*& p_sound) LegoCacheSound* sound = (*listIter).GetSound(); if (sound == p_sound) { - p_sound->FUN_10006b80(); + p_sound->Stop(); return; } } @@ -176,7 +176,7 @@ void LegoCacheSoundManager::Destroy(LegoCacheSound*& p_sound) for (Set100d6b4c::iterator setIter = m_set.begin(); setIter != m_set.end(); setIter++) { #endif if ((*setIter).GetSound() == p_sound) { - p_sound->FUN_10006b80(); + p_sound->Stop(); delete p_sound; m_set.erase(setIter); @@ -196,7 +196,7 @@ void LegoCacheSoundManager::Destroy(LegoCacheSound*& p_sound) LegoCacheSound* sound = (*listIter).GetSound(); if (sound == p_sound) { - p_sound->FUN_10006b80(); + p_sound->Stop(); delete sound; m_list.erase(listIter); diff --git a/LEGO1/lego/legoomni/src/audio/legocachsound.cpp b/LEGO1/lego/legoomni/src/audio/legocachsound.cpp index 7665e5d7..47e9b98c 100644 --- a/LEGO1/lego/legoomni/src/audio/legocachsound.cpp +++ b/LEGO1/lego/legoomni/src/audio/legocachsound.cpp @@ -181,7 +181,7 @@ MxResult LegoCacheSound::Play(const char* p_name, MxBool p_looping) } // FUNCTION: LEGO1 0x10006b80 -void LegoCacheSound::FUN_10006b80() +void LegoCacheSound::Stop() { DWORD dwStatus; m_dsBuffer->GetStatus(&dwStatus); diff --git a/LEGO1/lego/legoomni/src/entity/act2brick.cpp b/LEGO1/lego/legoomni/src/entity/act2brick.cpp index 0b8acee3..68e2ab4e 100644 --- a/LEGO1/lego/legoomni/src/entity/act2brick.cpp +++ b/LEGO1/lego/legoomni/src/entity/act2brick.cpp @@ -95,7 +95,7 @@ MxLong Act2Brick::Notify(MxParam& p_param) void Act2Brick::FUN_1007a9d0() { if (m_unk0x154 != NULL) { - SoundManager()->GetCacheSoundManager()->FUN_1003db80(m_unk0x154); + SoundManager()->GetCacheSoundManager()->Stop(m_unk0x154); m_unk0x154 = NULL; } } diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp index 927ad4a4..93f7c94b 100644 --- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp @@ -26,7 +26,7 @@ LegoActor::LegoActor() LegoActor::~LegoActor() { if (m_sound) { - m_sound->FUN_10006b80(); + m_sound->Stop(); } }