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

Fix deletes

Browse Source
This commit is contained in:
Christian Semmler 2023-08-10 06:40:28 -04:00
parent ee54fc4251
commit d2c2a1b002
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/mxdsaction.cpp
View File

@ -3,6 +3,8 @@
#include <float.h> #include <float.h>
#include <limits.h> #include <limits.h>
DECOMP_SIZE_ASSERT(MxDSAction, 0x94)
// GLOBAL OFFSET: LEGO1 0x10101410 // GLOBAL OFFSET: LEGO1 0x10101410
MxU16 g_unkSep = TWOCC(',', ' '); MxU16 g_unkSep = TWOCC(',', ' ');
@ -42,7 +44,7 @@ MxDSAction::MxDSAction()
// OFFSET: LEGO1 0x100ada80 // OFFSET: LEGO1 0x100ada80
MxDSAction::~MxDSAction() MxDSAction::~MxDSAction()
{ {
delete this->m_unkData; delete[] this->m_unkData;
} }
// OFFSET: LEGO1 0x100adaf0 // OFFSET: LEGO1 0x100adaf0
@ -188,7 +190,7 @@ void MxDSAction::MergeFrom(MxDSAction &p_dsAction)
char *unkData = p_dsAction.m_unkData; char *unkData = p_dsAction.m_unkData;
if (unkLength && unkData) { if (unkLength && unkData) {
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;
AppendData(unkLength, unkData); AppendData(unkLength, unkData);
} }
@ -233,7 +235,7 @@ void MxDSAction::AppendData(MxU16 p_unkLength, const char *p_unkData)
memcpy(&concat[this->m_unkLength + sizeof(g_unkSep)], p_unkData, p_unkLength); memcpy(&concat[this->m_unkLength + sizeof(g_unkSep)], p_unkData, p_unkLength);
this->m_unkLength += p_unkLength + sizeof(g_unkSep); this->m_unkLength += p_unkLength + sizeof(g_unkSep);
delete this->m_unkData; delete[] this->m_unkData;
this->m_unkData = concat; this->m_unkData = concat;
} }
else { else {