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

Readability

Browse Source
This commit is contained in:
Christian Semmler 2024-01-10 06:36:35 -05:00
parent 0d8caf3d34
commit 95e87a9972
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
View File

@ -272,21 +272,28 @@ MxBool MxDiskStreamProvider::FUN_100d1af0(MxDSStreamingAction* p_action)
MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action) MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
{ {
MxDSBuffer* buffer = new MxDSBuffer(); MxDSBuffer* buffer = new MxDSBuffer();
if (!buffer) if (!buffer)
return FAILURE; return FAILURE;
MxU32 size = p_action->GetUnknowna0()->GetWriteOffset() - p_action->GetUnknown94() + p_action->GetBufferOffset() + MxU32 size = p_action->GetUnknowna0()->GetWriteOffset() - p_action->GetUnknown94() + p_action->GetBufferOffset() +
(p_action->GetUnknowna4() ? p_action->GetUnknowna4()->GetWriteOffset() : 0); (p_action->GetUnknowna4() ? p_action->GetUnknowna4()->GetWriteOffset() : 0);
if (buffer->AllocateBuffer(size, MxDSBufferType_Allocate) != SUCCESS) { if (buffer->AllocateBuffer(size, MxDSBufferType_Allocate) != SUCCESS) {
if (!buffer) if (!buffer)
return FAILURE; return FAILURE;
delete buffer; delete buffer;
return FAILURE; return FAILURE;
} }
MxDSBuffer* buffer2 = p_action->GetUnknowna4(); MxDSBuffer* buffer2 = p_action->GetUnknowna4();
MxU8** pdata; MxU8** pdata;
MxU8* data; MxU8* data;
if (buffer2 == NULL) { if (buffer2 == NULL) {
pdata = buffer->GetBufferRef(); pdata = buffer->GetBufferRef();
memcpy( memcpy(
data = *pdata, data = *pdata,
p_action->GetUnknowna0()->GetBuffer() - p_action->GetBufferOffset() + p_action->GetUnknown94(), p_action->GetUnknowna0()->GetBuffer() - p_action->GetBufferOffset() + p_action->GetUnknown94(),
@ -296,38 +303,49 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
else { else {
buffer->FUN_100c7090(buffer2); buffer->FUN_100c7090(buffer2);
pdata = buffer->GetBufferRef(); pdata = buffer->GetBufferRef();
memcpy( memcpy(
data = (p_action->GetUnknowna4()->GetWriteOffset() + *pdata), data = (p_action->GetUnknowna4()->GetWriteOffset() + *pdata),
p_action->GetUnknowna0()->GetBuffer(), p_action->GetUnknowna0()->GetBuffer(),
p_action->GetUnknowna0()->GetWriteOffset() p_action->GetUnknowna0()->GetWriteOffset()
); );
delete p_action->GetUnknowna4(); delete p_action->GetUnknowna4();
} }
p_action->SetUnknowna4(buffer); p_action->SetUnknowna4(buffer);
while (data) { while (data) {
if (*MxDSChunk::IntoType(data) != 'bOxM') { if (*MxDSChunk::IntoType(data) != FOURCC('M', 'x', 'O', 'b')) {
if (*MxStreamChunk::IntoTime(data) > p_action->GetUnknown9c()) { if (*MxStreamChunk::IntoTime(data) > p_action->GetUnknown9c()) {
*MxDSChunk::IntoType(data) = ' dap'; *MxDSChunk::IntoType(data) = FOURCC('p', 'a', 'd', ' ');
memcpy(data + 8, *pdata, buffer->GetWriteOffset() + *pdata - data - 8); memcpy(data + 8, *pdata, buffer->GetWriteOffset() + *pdata - data - 8);
size = ReadData(*pdata, buffer->GetWriteOffset()); size = ReadData(*pdata, buffer->GetWriteOffset());
MxDSBuffer* buffer3 = new MxDSBuffer(); MxDSBuffer* buffer3 = new MxDSBuffer();
if (!buffer3) if (!buffer3)
return FAILURE; return FAILURE;
if (buffer3->AllocateBuffer(size, MxDSBufferType_Allocate) == SUCCESS) { if (buffer3->AllocateBuffer(size, MxDSBufferType_Allocate) == SUCCESS) {
memcpy(buffer3->GetBuffer(), p_action->GetUnknowna4()->GetBuffer(), size); memcpy(buffer3->GetBuffer(), p_action->GetUnknowna4()->GetBuffer(), size);
p_action->GetUnknowna4()->SetMode(MxDSBufferType_Allocate); p_action->GetUnknowna4()->SetMode(MxDSBufferType_Allocate);
delete p_action->GetUnknowna4(); delete p_action->GetUnknowna4();
buffer3->SetMode(MxDSBufferType_Unknown); buffer3->SetMode(MxDSBufferType_Unknown);
p_action->SetUnknowna4(buffer3); p_action->SetUnknowna4(buffer3);
MxDSBuffer* buffer4 = p_action->GetUnknowna0(); MxDSBuffer* buffer4 = p_action->GetUnknowna0();
MxU32 unk0x14 = buffer4->GetUnknown14(); MxU32 unk0x14 = buffer4->GetUnknown14();
MxU8* data2 = buffer4->GetBuffer(); MxU8* data2 = buffer4->GetBuffer();
while (true) {
while (TRUE) {
if (*MxStreamChunk::IntoTime(data2) > p_action->GetUnknown9c()) if (*MxStreamChunk::IntoTime(data2) > p_action->GetUnknown9c())
break; break;
data += MxDSChunk::Size(*MxDSChunk::IntoLength(data)); data += MxDSChunk::Size(*MxDSChunk::IntoLength(data));
unk0x14 += MxDSChunk::Size(*MxDSChunk::IntoLength(data)); unk0x14 += MxDSChunk::Size(*MxDSChunk::IntoLength(data));
} }
p_action->SetUnknown94(unk0x14); p_action->SetUnknown94(unk0x14);
p_action->SetBufferOffset(p_action->GetUnknowna0()->GetUnknown14()); p_action->SetBufferOffset(p_action->GetUnknowna0()->GetUnknown14());
delete p_action->GetUnknowna0(); delete p_action->GetUnknowna0();
@ -339,8 +357,10 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
} }
} }
} }
data = buffer->FUN_100c6fa0(data); data = buffer->FUN_100c6fa0(data);
} }
p_action->SetUnknown94(GetFileSize() + p_action->GetBufferOffset()); p_action->SetUnknown94(GetFileSize() + p_action->GetBufferOffset());
p_action->SetBufferOffset(GetFileSize() + p_action->GetBufferOffset()); p_action->SetBufferOffset(GetFileSize() + p_action->GetBufferOffset());
FUN_100d1780(p_action); FUN_100d1780(p_action);