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

Implement/match Lego3DWavePresenter::StartingTickle (#972)

Browse Source 
* Implement/match Lego3DWavePresenter::StartingTickle

* Fix annotation

* Add StreamingTickle

* Rename
This commit is contained in:
Christian Semmler
2024-05-30 10:27:18 -04:00
committed by GitHub
parent 650903d043
commit ab4ba9fc4f
7 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
LEGO1/lego/legoomni/src/audio/legounknown100d5778.cpp → LEGO1/lego/legoomni/src/audio/lego3dsound.cpp
View File

@@ -1,25 +1,25 @@
#include "legounknown100d5778.h"
#include "lego3dsound.h"
#include "legocharactermanager.h"
#include "misc.h"
#include "mxomni.h"
DECOMP_SIZE_ASSERT(LegoUnknown100d5778, 0x30)
DECOMP_SIZE_ASSERT(Lego3DSound, 0x30)
// FUNCTION: LEGO1 0x10011630
LegoUnknown100d5778::LegoUnknown100d5778()
Lego3DSound::Lego3DSound()
{
Init();
}
// FUNCTION: LEGO1 0x10011670
LegoUnknown100d5778::~LegoUnknown100d5778()
Lego3DSound::~Lego3DSound()
{
Destroy();
}
// FUNCTION: LEGO1 0x10011680
void LegoUnknown100d5778::Init()
void Lego3DSound::Init()
{
m_dsBuffer = NULL;
m_unk0x0c = NULL;
@@ -27,16 +27,17 @@ void LegoUnknown100d5778::Init()
m_unk0x18 = 0;
m_unk0x14 = FALSE;
m_unk0x15 = FALSE;
m_unk0x2c = 79;
m_volume = 79;
}
// STUB: LEGO1 0x100116a0
MxResult LegoUnknown100d5778::FUN_100116a0(LPDIRECTSOUND p_dsound, undefined4, undefined4 p_unk0x2c)
// FUNCTION: BETA10 0x10039647
MxResult Lego3DSound::Create(LPDIRECTSOUNDBUFFER p_directSoundBuffer, const char*, MxS32 p_volume)
{
m_unk0x2c = p_unk0x2c;
m_volume = p_volume;
if (MxOmni::IsSound3D()) {
p_dsound->QueryInterface(IID_IDirectSoundBuffer, (LPVOID*) &m_dsBuffer);
p_directSoundBuffer->QueryInterface(IID_IDirectSoundBuffer, (LPVOID*) &m_dsBuffer);
if (m_dsBuffer == NULL) {
return FAILURE;
}
@@ -50,7 +51,7 @@ MxResult LegoUnknown100d5778::FUN_100116a0(LPDIRECTSOUND p_dsound, undefined4, u
}
// FUNCTION: LEGO1 0x10011880
void LegoUnknown100d5778::Destroy()
void Lego3DSound::Destroy()
{
if (m_dsBuffer) {
m_dsBuffer->Release();
@@ -70,20 +71,21 @@ void LegoUnknown100d5778::Destroy()
}
// STUB: LEGO1 0x100118e0
undefined4 LegoUnknown100d5778::FUN_100118e0(LPDIRECTSOUNDBUFFER p_dsBuffer)
// FUNCTION: BETA10 0x10039a2a
undefined4 Lego3DSound::FUN_100118e0(LPDIRECTSOUNDBUFFER p_directSoundBuffer)
{
// TODO
return 0;
}
// STUB: LEGO1 0x10011ca0
void LegoUnknown100d5778::FUN_10011ca0()
void Lego3DSound::FUN_10011ca0()
{
// TODO
}
// STUB: LEGO1 0x10011cf0
MxS32 LegoUnknown100d5778::FUN_10011cf0(undefined4, undefined4)
MxS32 Lego3DSound::FUN_10011cf0(undefined4, undefined4)
{
// TODO
return 0;

26
LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
View File

@@ -1,5 +1,7 @@
#include "lego3dwavepresenter.h"
#include "mxcompositepresenter.h"
#include "mxdsaction.h"
#include "mxomni.h"
DECOMP_SIZE_ASSERT(Lego3DWavePresenter, 0xa0)
@@ -28,7 +30,8 @@ void Lego3DWavePresenter::Destroy()
}
}
// STUB: LEGO1 0x1004a810
// FUNCTION: LEGO1 0x1004a810
// FUNCTION: BETA10 0x1003a3b0
void Lego3DWavePresenter::StartingTickle()
{
if (MxOmni::IsSound3D()) {
@@ -37,12 +40,27 @@ void Lego3DWavePresenter::StartingTickle()
MxWavePresenter::StartingTickle();
// TODO
if (m_dsBuffer != NULL) {
MxU16 extraLength;
char* buff;
m_action->GetExtra(extraLength, buff);
if (!strcmp(buff, "FROM_PARENT") && m_compositePresenter != NULL) {
m_compositePresenter->GetAction()->GetExtra(extraLength, buff);
}
if (m_sound.Create(m_dsBuffer, buff, m_volume) != SUCCESS) {
m_dsBuffer->Release();
m_dsBuffer = NULL;
EndAction();
}
}
}
// STUB: LEGO1 0x1004a8b0
// FUNCTION: LEGO1 0x1004a8b0
// FUNCTION: BETA10 0x1003a4cc
void Lego3DWavePresenter::StreamingTickle()
{
MxWavePresenter::StreamingTickle();
// TODO
m_sound.FUN_100118e0(m_dsBuffer);
}