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

Refactor Deserialize method parameters in MxDS classes to use p_flags instead of p_unk0x24 (#1450)

Browse Source
This commit is contained in:
Florian Kaiser
2025-05-08 21:26:48 +02:00
committed by GitHub
parent c8ae2e22cc
commit 0a2d598b57
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/omni/src/action/mxdsaction.cpp
View File

@@ -256,9 +256,9 @@ void MxDSAction::AppendExtra(MxU16 p_extraLength, const char* p_extraData)
// FUNCTION: LEGO1 0x100adf70 // FUNCTION: LEGO1 0x100adf70
// FUNCTION: BETA10 0x1012ba6a // FUNCTION: BETA10 0x1012ba6a
void MxDSAction::Deserialize(MxU8*& p_source, MxS16 p_unk0x24) void MxDSAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
{ {
MxDSObject::Deserialize(p_source, p_unk0x24); MxDSObject::Deserialize(p_source, p_flags);
// clang-format off // clang-format off
m_flags = *( MxU32*) p_source; p_source += sizeof(m_flags); m_flags = *( MxU32*) p_source; p_source += sizeof(m_flags);

4
LEGO1/omni/src/action/mxdsmediaaction.cpp
View File

@@ -129,9 +129,9 @@ MxU32 MxDSMediaAction::GetSizeOnDisk()
// FUNCTION: LEGO1 0x100c8f60 // FUNCTION: LEGO1 0x100c8f60
// FUNCTION: BETA10 0x1015cc93 // FUNCTION: BETA10 0x1015cc93
void MxDSMediaAction::Deserialize(MxU8*& p_source, MxS16 p_unk0x24) void MxDSMediaAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
{ {
MxDSAction::Deserialize(p_source, p_unk0x24); MxDSAction::Deserialize(p_source, p_flags);
CopyMediaSrcPath((char*) p_source); CopyMediaSrcPath((char*) p_source);
p_source += strlen(m_mediaSrcPath) + 1; p_source += strlen(m_mediaSrcPath) + 1;

6
LEGO1/omni/src/action/mxdsmultiaction.cpp
View File

@@ -149,9 +149,9 @@ MxU32 MxDSMultiAction::GetSizeOnDisk()
// FUNCTION: LEGO1 0x100ca7b0 // FUNCTION: LEGO1 0x100ca7b0
// FUNCTION: BETA10 0x10159b79 // FUNCTION: BETA10 0x10159b79
void MxDSMultiAction::Deserialize(MxU8*& p_source, MxS16 p_unk0x24) void MxDSMultiAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
{ {
MxDSAction::Deserialize(p_source, p_unk0x24); MxDSAction::Deserialize(p_source, p_flags);
MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1;
p_source += 12; p_source += 12;
@@ -164,7 +164,7 @@ void MxDSMultiAction::Deserialize(MxU8*& p_source, MxS16 p_unk0x24)
MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1;
p_source += 8; p_source += 8;
MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24); MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_flags);
p_source += extraFlag; p_source += extraFlag;
m_actionList->Append(action); m_actionList->Append(action);

4
LEGO1/omni/src/action/mxdsobject.cpp
View File

@@ -156,7 +156,7 @@ MxU32 MxDSObject::GetSizeOnDisk()
// FUNCTION: LEGO1 0x100bfa20 // FUNCTION: LEGO1 0x100bfa20
// FUNCTION: BETA10 0x10147d73 // FUNCTION: BETA10 0x10147d73
void MxDSObject::Deserialize(MxU8*& p_source, MxS16 p_unk0x24) void MxDSObject::Deserialize(MxU8*& p_source, MxS16 p_flags)
{ {
SetSourceName((char*) p_source); SetSourceName((char*) p_source);
p_source += strlen(m_sourceName) + 1; p_source += strlen(m_sourceName) + 1;
@@ -170,7 +170,7 @@ void MxDSObject::Deserialize(MxU8*& p_source, MxS16 p_unk0x24)
m_objectId = *(MxU32*) p_source; m_objectId = *(MxU32*) p_source;
p_source += sizeof(m_objectId); p_source += sizeof(m_objectId);
m_unk0x24 = p_unk0x24; m_unk0x24 = p_flags;
} }
// FUNCTION: LEGO1 0x100bfa80 // FUNCTION: LEGO1 0x100bfa80

6
LEGO1/omni/src/action/mxdsselectaction.cpp
View File

@@ -92,11 +92,11 @@ MxU32 MxDSSelectAction::GetSizeOnDisk()
// FUNCTION: LEGO1 0x100cbf60 // FUNCTION: LEGO1 0x100cbf60
// FUNCTION: BETA10 0x1015aa30 // FUNCTION: BETA10 0x1015aa30
void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_unk0x24) void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
{ {
MxDSAction* action = NULL; MxDSAction* action = NULL;
MxString string; MxString string;
MxDSAction::Deserialize(p_source, p_unk0x24); MxDSAction::Deserialize(p_source, p_flags);
MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1;
p_source += 12; p_source += 12;
@@ -138,7 +138,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_unk0x24)
MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1;
p_source += 8; p_source += 8;
action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24); action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_flags);
if (index == i) { if (index == i) {
m_actionList->Append(action); m_actionList->Append(action);

4
LEGO1/omni/src/action/mxdssound.cpp
View File

@@ -58,9 +58,9 @@ MxDSAction* MxDSSound::Clone()
// FUNCTION: LEGO1 0x100c95a0 // FUNCTION: LEGO1 0x100c95a0
// FUNCTION: BETA10 0x1015d272 // FUNCTION: BETA10 0x1015d272
void MxDSSound::Deserialize(MxU8*& p_source, MxS16 p_unk0x24) void MxDSSound::Deserialize(MxU8*& p_source, MxS16 p_flags)
{ {
MxDSMediaAction::Deserialize(p_source, p_unk0x24); MxDSMediaAction::Deserialize(p_source, p_flags);
m_volume = *(MxS32*) p_source; m_volume = *(MxS32*) p_source;
p_source += sizeof(m_volume); p_source += sizeof(m_volume);
} }