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

Rename functions

Browse Source
This commit is contained in:
Christian Semmler 2024-11-25 14:00:51 -07:00
parent 461b623df1
commit 9bfd4ee53a
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legocachesoundmanager.h
View File

@ -58,7 +58,7 @@ class LegoCacheSoundManager {
LegoCacheSound* ManageSoundEntry(LegoCacheSound* p_sound); LegoCacheSound* ManageSoundEntry(LegoCacheSound* p_sound);
LegoCacheSound* Play(const char* p_key, const char* p_name, MxBool p_looping); 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); 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); void Destroy(LegoCacheSound*& p_sound);
private: private:

2
LEGO1/lego/legoomni/include/legocachsound.h
View File

@ -41,7 +41,7 @@ class LegoCacheSound : public MxCore {
LegoCacheSound* Clone(); LegoCacheSound* Clone();
MxResult Play(const char* p_name, MxBool p_looping); MxResult Play(const char* p_name, MxBool p_looping);
void FUN_10006b80(); void Stop();
void FUN_10006be0(); void FUN_10006be0();
void SetDistance(MxS32 p_min, MxS32 p_max); void SetDistance(MxS32 p_min, MxS32 p_max);
void Mute(MxBool p_mute); void Mute(MxBool p_mute);

16
LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp
View File

@ -14,14 +14,14 @@ LegoCacheSoundManager::~LegoCacheSoundManager()
while (!m_set.empty()) { while (!m_set.empty()) {
sound = (*m_set.begin()).GetSound(); sound = (*m_set.begin()).GetSound();
m_set.erase(m_set.begin()); m_set.erase(m_set.begin());
sound->FUN_10006b80(); sound->Stop();
delete sound; delete sound;
} }
while (!m_list.empty()) { while (!m_list.empty()) {
sound = (*m_list.begin()).GetSound(); sound = (*m_list.begin()).GetSound();
m_list.erase(m_list.begin()); m_list.erase(m_list.begin());
sound->FUN_10006b80(); sound->Stop();
// DECOMP: delete should not be inlined here // DECOMP: delete should not be inlined here
delete sound; delete sound;
} }
@ -51,7 +51,7 @@ MxResult LegoCacheSoundManager::Tickle()
listIter++; listIter++;
} }
else { else {
sound->FUN_10006b80(); sound->Stop();
m_list.erase(listIter++); m_list.erase(listIter++);
delete sound; delete sound;
} }
@ -134,7 +134,7 @@ LegoCacheSound* LegoCacheSoundManager::Play(LegoCacheSound* p_sound, const char*
// FUNCTION: LEGO1 0x1003db80 // FUNCTION: LEGO1 0x1003db80
// FUNCTION: BETA10 0x100656a7 // FUNCTION: BETA10 0x100656a7
void LegoCacheSoundManager::FUN_1003db80(LegoCacheSound*& p_sound) void LegoCacheSoundManager::Stop(LegoCacheSound*& p_sound)
{ {
#ifdef COMPAT_MODE #ifdef COMPAT_MODE
Set100d6b4c::iterator setIter; 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++) { for (Set100d6b4c::iterator setIter = m_set.begin(); setIter != m_set.end(); setIter++) {
#endif #endif
if ((*setIter).GetSound() == p_sound) { if ((*setIter).GetSound() == p_sound) {
p_sound->FUN_10006b80(); p_sound->Stop();
return; return;
} }
} }
@ -160,7 +160,7 @@ void LegoCacheSoundManager::FUN_1003db80(LegoCacheSound*& p_sound)
LegoCacheSound* sound = (*listIter).GetSound(); LegoCacheSound* sound = (*listIter).GetSound();
if (sound == p_sound) { if (sound == p_sound) {
p_sound->FUN_10006b80(); p_sound->Stop();
return; return;
} }
} }
@ -176,7 +176,7 @@ void LegoCacheSoundManager::Destroy(LegoCacheSound*& p_sound)
for (Set100d6b4c::iterator setIter = m_set.begin(); setIter != m_set.end(); setIter++) { for (Set100d6b4c::iterator setIter = m_set.begin(); setIter != m_set.end(); setIter++) {
#endif #endif
if ((*setIter).GetSound() == p_sound) { if ((*setIter).GetSound() == p_sound) {
p_sound->FUN_10006b80(); p_sound->Stop();
delete p_sound; delete p_sound;
m_set.erase(setIter); m_set.erase(setIter);
@ -196,7 +196,7 @@ void LegoCacheSoundManager::Destroy(LegoCacheSound*& p_sound)
LegoCacheSound* sound = (*listIter).GetSound(); LegoCacheSound* sound = (*listIter).GetSound();
if (sound == p_sound) { if (sound == p_sound) {
p_sound->FUN_10006b80(); p_sound->Stop();
delete sound; delete sound;
m_list.erase(listIter); m_list.erase(listIter);

2
LEGO1/lego/legoomni/src/audio/legocachsound.cpp
View File

@ -181,7 +181,7 @@ MxResult LegoCacheSound::Play(const char* p_name, MxBool p_looping)
} }
// FUNCTION: LEGO1 0x10006b80 // FUNCTION: LEGO1 0x10006b80
void LegoCacheSound::FUN_10006b80() void LegoCacheSound::Stop()
{ {
DWORD dwStatus; DWORD dwStatus;
m_dsBuffer->GetStatus(&dwStatus); m_dsBuffer->GetStatus(&dwStatus);

2
LEGO1/lego/legoomni/src/entity/act2brick.cpp
View File

@ -95,7 +95,7 @@ MxLong Act2Brick::Notify(MxParam& p_param)
void Act2Brick::FUN_1007a9d0() void Act2Brick::FUN_1007a9d0()
{ {
if (m_unk0x154 != NULL) { if (m_unk0x154 != NULL) {
SoundManager()->GetCacheSoundManager()->FUN_1003db80(m_unk0x154); SoundManager()->GetCacheSoundManager()->Stop(m_unk0x154);
m_unk0x154 = NULL; m_unk0x154 = NULL;
} }
} }

2
LEGO1/lego/legoomni/src/entity/legoactor.cpp
View File

@ -26,7 +26,7 @@ LegoActor::LegoActor()
LegoActor::~LegoActor() LegoActor::~LegoActor()
{ {
if (m_sound) { if (m_sound) {
m_sound->FUN_10006b80(); m_sound->Stop();
} }
} }