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

Update mxdsaction.cpp

Browse Source
This commit is contained in:
Christian Semmler 2023-08-09 16:03:21 -04:00 committed by GitHub
parent 937c0bd6d4
commit 180ce4d802
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/mxdsaction.cpp
View File

@ -61,7 +61,7 @@ void MxDSAction::CopyFrom(MxDSAction &p_dsAction)
// this->m_direction.SetVector(p_dsAction.m_direction.GetData()); // this->m_direction.SetVector(p_dsAction.m_direction.GetData());
// this->m_up.SetVector(p_dsAction.m_up.GetData()); // this->m_up.SetVector(p_dsAction.m_up.GetData());
ConcatData(p_dsAction.m_unkLength, p_dsAction.m_unkData); AppendData(p_dsAction.m_unkLength, p_dsAction.m_unkData);
this->m_unk84 = p_dsAction.m_unk84; this->m_unk84 = p_dsAction.m_unk84;
this->m_unk88 = p_dsAction.m_unk88; this->m_unk88 = p_dsAction.m_unk88;
this->m_omni = p_dsAction.m_omni; this->m_omni = p_dsAction.m_omni;
@ -125,7 +125,7 @@ void MxDSAction::Deserialize(char **p_source, MxS16 p_unk24)
MxU16 unkLength = *(MxU16*) *p_source; MxU16 unkLength = *(MxU16*) *p_source;
*p_source += sizeof(MxU16); *p_source += sizeof(MxU16);
if (unkLength) { if (unkLength) {
ConcatData(unkLength, *p_source); AppendData(unkLength, *p_source);
*p_source += unkLength; *p_source += unkLength;
} }
} }
@ -193,7 +193,7 @@ void MxDSAction::MergeFrom(MxDSAction &p_dsAction)
if (!this->m_unkData || !strncmp("XXX", this->m_unkData, 3)) { if (!this->m_unkData || !strncmp("XXX", this->m_unkData, 3)) {
delete this->m_unkData; delete this->m_unkData;
this->m_unkLength = 0; this->m_unkLength = 0;
ConcatData(unkLength, unkData); AppendData(unkLength, unkData);
} }
} }
} }
@ -223,7 +223,7 @@ MxLong MxDSAction::GetCurrentTime()
} }
// OFFSET: LEGO1 0x100ade60 // OFFSET: LEGO1 0x100ade60
void MxDSAction::ConcatData(MxU16 p_unkLength, void *p_unkData) void MxDSAction::AppendData(MxU16 p_unkLength, const char *p_unkData)
{ {
if (this->m_unkData == p_unkData || !p_unkData) if (this->m_unkData == p_unkData || !p_unkData)
return; return;
@ -248,4 +248,4 @@ void MxDSAction::ConcatData(MxU16 p_unkLength, void *p_unkData)
memcpy(copy, p_unkData, p_unkLength); memcpy(copy, p_unkData, p_unkLength);
} }
} }
} }