diff --git a/LEGO1/lego/legoomni/include/legocachesoundmanager.h b/LEGO1/lego/legoomni/include/legocachesoundmanager.h index e8dbc204..8297b416 100644 --- a/LEGO1/lego/legoomni/include/legocachesoundmanager.h +++ b/LEGO1/lego/legoomni/include/legocachesoundmanager.h @@ -12,7 +12,7 @@ struct LegoCacheSoundEntry { LegoCacheSoundEntry() : m_sound(NULL), m_name(NULL) {} LegoCacheSoundEntry(LegoCacheSound* p_sound, const char* p_name) : m_sound(p_sound), m_name(p_name) {} - LegoCacheSoundEntry(LegoCacheSound* p_sound) : m_sound(p_sound), m_name(p_sound->GetString0x48().GetData()) {} + LegoCacheSoundEntry(LegoCacheSound* p_sound) : m_sound(p_sound), m_name(p_sound->GetUnknown0x48().GetData()) {} // FUNCTION: LEGO1 0x1003d030 ~LegoCacheSoundEntry() diff --git a/LEGO1/lego/legoomni/include/legocachsound.h b/LEGO1/lego/legoomni/include/legocachsound.h index 7f3a62b7..10d0108b 100644 --- a/LEGO1/lego/legoomni/include/legocachsound.h +++ b/LEGO1/lego/legoomni/include/legocachsound.h @@ -36,8 +36,8 @@ class LegoCacheSound : public MxCore { virtual void Destroy(); // vtable+0x18 virtual void FUN_10006cd0(undefined4, undefined4); // vtable+0x1c - inline const MxString& GetString0x48() const { return m_unk0x48; } - inline const undefined GetUnk0x58() const { return m_unk0x58; } + inline const MxString& GetUnknown0x48() const { return m_unk0x48; } + inline const undefined GetUnknown0x58() const { return m_unk0x58; } LegoCacheSound* FUN_10006960(); MxResult FUN_10006a30(const char* p_str, MxBool); diff --git a/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp index 8d645dfd..6628246b 100644 --- a/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/legocachesoundmanager.cpp @@ -37,7 +37,7 @@ MxResult LegoCacheSoundManager::Tickle() for (Set100d6b4c::iterator setIter = m_set.begin(); setIter != m_set.end(); setIter++) { #endif LegoCacheSound* sound = (*setIter).GetSound(); - if (sound->GetUnk0x58()) { + if (sound->GetUnknown0x58()) { sound->FUN_10006be0(); } } @@ -46,7 +46,7 @@ MxResult LegoCacheSoundManager::Tickle() while (listIter != m_list.end()) { LegoCacheSound* sound = (*listIter).GetSound(); - if (sound->GetUnk0x58()) { + if (sound->GetUnknown0x58()) { sound->FUN_10006be0(); listIter++; } @@ -84,7 +84,7 @@ LegoCacheSound* LegoCacheSoundManager::ManageSoundEntry(LegoCacheSound* p_sound) if (it != m_set.end()) { LegoCacheSound* sound = (*it).GetSound(); - if (sound->GetUnk0x58()) { + if (sound->GetUnknown0x58()) { m_list.push_back(LegoCacheSoundEntry(p_sound)); return p_sound; } @@ -117,7 +117,7 @@ LegoCacheSound* LegoCacheSoundManager::FUN_1003db10(LegoCacheSound* p_one, const return NULL; } - if (p_one->GetUnk0x58()) { + if (p_one->GetUnknown0x58()) { LegoCacheSound* result = p_one->FUN_10006960(); if (result) {