mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-22 16:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match LegoCacheSound::Create and LegoLoadCacheSoundPresenter::StreamingTickle (#986)

Browse Source 
* Implement/match LegoCacheSound::Create

* Naming

* Fix naming

* Fix parens
This commit is contained in:
Christian Semmler
2024-06-01 17:29:37 -04:00
committed by GitHub
parent 1423eb56fc
commit 03ffb9c5de
9 changed files with 165 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()

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

@@ -26,12 +26,18 @@ public:
return !strcmp(p_name, LegoCacheSound::ClassName()) || MxCore::IsA(p_name);
}
virtual MxResult FUN_10006710(); // vtable+0x14
virtual MxResult Create(
LPPCMWAVEFORMAT p_pwfx,
MxString p_mediaSrcPath,
MxS32 p_volume,
MxU8* p_data,
MxU32 p_dataSize
); // vtable+0x14
virtual void Destroy(); // vtable+0x18
virtual void FUN_10006cd0(undefined4, undefined4); // vtable+0x1c
inline const MxString& GetString0x48() const { return m_string0x48; }
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);
@@ -44,20 +50,22 @@ public:
private:
void Init();
void CopyData(MxU8* p_data, MxU32 p_dataSize);
MxString FUN_10006d80(const MxString& p_str);
LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x08
undefined m_unk0xc[4]; // 0x0c
undefined m_unk0x0c[4]; // 0x0c
Lego3DSound m_sound; // 0x10
undefined* m_unk0x40; // 0x40
undefined4 m_unk0x44; // 0x44
MxString m_string0x48; // 0x48
MxU8* m_data; // 0x40
MxU32 m_dataSize; // 0x44
MxString m_unk0x48; // 0x48
undefined m_unk0x58; // 0x58
PCMWAVEFORMAT m_unk0x59; // 0x59
PCMWAVEFORMAT m_wfx; // 0x59
MxBool m_isLooping; // 0x69
MxBool m_unk0x6a; // 0x6a
undefined4 m_unk0x6c; // 0x6c
MxS32 m_volume; // 0x6c
undefined m_unk0x70; // 0x70
MxString m_string0x74; // 0x74
MxString m_unk0x74; // 0x74
undefined m_unk0x84; // 0x84
};

8
LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
View File

@@ -37,10 +37,10 @@ private:
void Destroy(MxBool p_fromDestructor);
LegoCacheSound* m_cacheSound; // 0x6c
undefined* m_unk0x70; // 0x70
undefined* m_unk0x74; // 0x74
undefined4 m_unk0x78; // 0x78
undefined m_unk0x7c; // 0x7c
MxU8* m_data; // 0x70
MxU8* m_pData; // 0x74
MxU32 m_dataSize; // 0x78
MxBool m_unk0x7c; // 0x7c
PCMWAVEFORMAT m_pcmWaveFormat; // 0x7d
};