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

Fixes and better matches

Browse Source
This commit is contained in:
Christian Semmler 2023-12-26 13:46:02 -05:00
parent 190926572f
commit dfda5c2503
5 changed files with 86 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
LEGO1/mxdsbuffer.cpp
View File

@ -286,72 +286,84 @@ MxResult MxDSBuffer::ParseChunk(
{ {
MxResult result = SUCCESS; MxResult result = SUCCESS;
if ((m_unk0x30->GetFlags() & 4) == 0 || m_unk0x30->GetUnknowna4() == NULL || -1 < p_header->GetTime()) { if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 && m_unk0x30->GetUnknowna8() && p_header->GetTime() < 0) {
MxLong& ptr = p_header->GetTimeRef(); delete p_header;
ptr = ptr + m_unk0x30->GetUnknowna8(); goto done;
}
if ((p_header->GetFlags() & 0x10) == 0) { p_header->SetTime(p_header->GetTime() + m_unk0x30->GetUnknowna8());
if ((p_header->GetFlags() & 2) != 0) {
if (m_unk0x30->HasId(p_header->GetObjectId())) {
// this could be an inlined function
if ((m_unk0x30->GetFlags() & 4) == 0 ||
m_unk0x30->GetLoopCount() < 2 && m_unk0x30->GetDuration() != -1) {
if (p_action->GetObjectId() == m_unk0x30->GetObjectId() &&
p_controller->VTable0x30(p_action) == SUCCESS) {
p_controller->GetProvider()->VTable0x20(p_action);
result = 1;
}
}
else {
if (p_action->GetObjectId() == p_header->GetObjectId()) {
MxU32 val = p_controller->GetProvider()->GetBufferForDWords()[m_unk0x30->GetObjectId()];
m_unk0x30->SetUnknown94(val);
m_unk0x30->SetBufferOffset((val / m_writeOffset) * m_writeOffset);
MxNextActionDataStart* data =
p_controller->FindNextActionDataStartFromStreamingAction(m_unk0x30);
if (data) {
data->SetData(m_unk0x30->GetBufferOffset());
}
m_unk0x30->FUN_100cd2d0();
}
delete p_header; if (p_header->GetFlags() & MxDSChunk::Flag_Bit5) {
p_header = NULL; MxU32 und = MxDSChunk::ReturnE();
} MxU32 length = p_header->GetLength();
} MxDSBuffer* buffer = new MxDSBuffer();
}
if (p_header) { if (buffer && buffer->AllocateBuffer(length + und + 8, MxDSBufferType_Allocate) == SUCCESS &&
if (p_header->SendChunk(p_controller->GetSubscriberList(), TRUE, p_action->GetUnknown24()) != SUCCESS) { buffer->CalcBytesRemaining((MxU8*) p_data) == SUCCESS) {
delete p_header; // improve no temp var
} MxDSStreamingAction* streamingAction = new MxDSStreamingAction((MxDSStreamingAction&) *p_action);
*p_streamingAction = streamingAction;
if (streamingAction) {
MxU16* flags = MxStreamChunk::IntoFlags(buffer->GetBuffer());
*flags = p_header->GetFlags() & ~MxDSChunk::Flag_Bit5;
delete p_header;
(*p_streamingAction)->SetUnknowna0(buffer);
goto done;
} }
} }
else {
MxDSBuffer* buffer = new MxDSBuffer(); if (buffer)
if (buffer) { delete buffer;
if (buffer->AllocateBuffer(p_header->GetLength() + 8 + MxDSChunk::ReturnE(), MxDSBufferType_Allocate) ==
SUCCESS && if (p_header)
CalcBytesRemaining((MxU8*) p_data) == SUCCESS) {
MxDSStreamingAction* streamingAction = new MxDSStreamingAction((MxDSStreamingAction&) *p_action);
*p_streamingAction = streamingAction;
if (streamingAction) {
MxU32* ptr2 = MxStreamChunk::ReturnPlus8Ptr((MxU32*) m_pBuffer);
*ptr2 = *ptr2 & 0xffef;
delete p_header;
(*p_streamingAction)->SetUnknowna0(buffer);
return SUCCESS;
}
}
delete buffer;
}
delete p_header; delete p_header;
}
result = FAILURE;
} }
else { else {
delete p_header; if (p_header->GetFlags() & MxDSChunk::Flag_Bit2) {
result = SUCCESS; if (m_unk0x30->HasId(p_header->GetObjectId())) {
if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 &&
(m_unk0x30->GetLoopCount() > 1 || m_unk0x30->GetDuration() == -1)) {
if (p_action->GetObjectId() == p_header->GetObjectId()) {
MxU32 val = p_controller->GetProvider()->GetBufferForDWords()[m_unk0x30->GetObjectId()];
m_unk0x30->SetUnknown94(val);
m_unk0x30->SetBufferOffset(m_writeOffset * (val / m_writeOffset));
MxNextActionDataStart* data =
p_controller->FindNextActionDataStartFromStreamingAction(m_unk0x30);
if (data)
data->SetData(m_unk0x30->GetBufferOffset());
m_unk0x30->FUN_100cd2d0();
}
delete p_header;
p_header = NULL;
}
else {
if (p_action->GetObjectId() == p_header->GetObjectId() &&
p_controller->VTable0x30(p_action) == SUCCESS) {
p_controller->GetProvider()->VTable0x20(p_action);
result = 1;
}
}
}
}
if (p_header) {
if (p_header->SendChunk(p_controller->GetSubscriberList(), TRUE, p_action->GetUnknown24()) != SUCCESS) {
delete p_header;
}
}
} }
done:
return result; return result;
} }

6
LEGO1/mxdschunk.cpp
View File

@ -19,3 +19,9 @@ MxDSChunk::~MxDSChunk()
delete[] m_data; delete[] m_data;
} }
} }
// FUNCTION: LEGO1 0x100be1e0
MxU32 MxDSChunk::ReturnE()
{
return 0xe;
}

7
LEGO1/mxdschunk.h
View File

@ -13,6 +13,8 @@ class MxDSChunk : public MxCore {
Flag_Bit1 = 0x01, Flag_Bit1 = 0x01,
Flag_Bit2 = 0x02, Flag_Bit2 = 0x02,
Flag_Bit3 = 0x04, Flag_Bit3 = 0x04,
Flag_Bit4 = 0x08,
Flag_Bit5 = 0x10,
Flag_Bit8 = 0x80, Flag_Bit8 = 0x80,
Flag_Bit16 = 0x8000 Flag_Bit16 = 0x8000
}; };
@ -33,6 +35,8 @@ class MxDSChunk : public MxCore {
return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name); return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name);
} }
static MxU32 ReturnE();
inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; } inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
inline void SetObjectId(undefined4 p_objectid) { m_objectId = p_objectid; } inline void SetObjectId(undefined4 p_objectid) { m_objectId = p_objectid; }
inline void SetTime(MxLong p_time) { m_time = p_time; } inline void SetTime(MxLong p_time) { m_time = p_time; }
@ -46,9 +50,6 @@ class MxDSChunk : public MxCore {
inline MxU32 GetLength() { return m_length; } inline MxU32 GetLength() { return m_length; }
inline MxU8* GetData() { return m_data; } inline MxU8* GetData() { return m_data; }
// FUNCTION: LEGO1 0x100be1e0
static MxU32 ReturnE() { return 0xe; }
inline void Release() inline void Release()
{ {
if (m_data) if (m_data)

6
LEGO1/mxstreamchunk.cpp
View File

@ -73,3 +73,9 @@ void MxStreamChunk::SetBuffer(MxDSBuffer* p_buffer)
{ {
m_buffer = p_buffer; m_buffer = p_buffer;
} }
// FUNCTION: LEGO1 0x100c3180
MxU16* MxStreamChunk::IntoFlags(MxU8* p_buffer)
{
return (MxU16*) (p_buffer + 8);
}

3
LEGO1/mxstreamchunk.h
View File

@ -34,8 +34,7 @@ class MxStreamChunk : public MxDSChunk {
MxResult SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_preappend, MxS16 p_obj24val); MxResult SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_preappend, MxS16 p_obj24val);
void SetBuffer(MxDSBuffer* p_buffer); void SetBuffer(MxDSBuffer* p_buffer);
// FUNCTION: LEGO1 0x100c3180 static MxU16* IntoFlags(MxU8* p_buffer);
static MxU32* ReturnPlus8Ptr(MxU32* p_chunk) { return p_chunk + 8; }
// FUNCTION: LEGO1 0x100c3190 // FUNCTION: LEGO1 0x100c3190
static MxU32* ReturnPlus10Ptr(MxU32* p_chunk) { return p_chunk + 10; } static MxU32* ReturnPlus10Ptr(MxU32* p_chunk) { return p_chunk + 10; }