mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-27 18:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Begin refactor Serialize functions

Browse Source
This commit is contained in:
Christian Semmler
2025-01-12 11:37:25 -07:00
parent 5c57b805de
commit e02fbe2fde
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legonamedplane.h
View File

@@ -31,7 +31,7 @@ public:
MxResult Serialize(LegoFile* p_file) MxResult Serialize(LegoFile* p_file)
{ {
if (p_file->IsWriteMode()) { if (p_file->IsWriteMode()) {
p_file->WriteString(m_name); p_file->Write(MxString(m_name));
p_file->WriteVector3(m_position); p_file->WriteVector3(m_position);
p_file->WriteVector3(m_direction); p_file->WriteVector3(m_direction);
p_file->WriteVector3(m_up); p_file->WriteVector3(m_up);

4
LEGO1/lego/legoomni/include/legostate.h
View File

@@ -74,7 +74,7 @@ public:
return SUCCESS; return SUCCESS;
} }
private: // private:
MxU32* m_objectIds; // 0x00 MxU32* m_objectIds; // 0x00
MxS16 m_length; // 0x04 MxS16 m_length; // 0x04
MxS16 m_mode; // 0x06 MxS16 m_mode; // 0x06
@@ -95,7 +95,7 @@ public:
virtual MxResult Serialize(LegoFile* p_file) virtual MxResult Serialize(LegoFile* p_file)
{ {
if (p_file->IsWriteMode()) { if (p_file->IsWriteMode()) {
p_file->WriteString(ClassName()); p_file->Write(MxString(ClassName()));
} }
return SUCCESS; return SUCCESS;
} // vtable+0x1c } // vtable+0x1c

4
LEGO1/lego/legoomni/src/actors/pizzeria.cpp
View File

@@ -124,12 +124,12 @@ MxResult PizzeriaState::Serialize(LegoFile* p_file)
if (p_file->IsReadMode()) { if (p_file->IsReadMode()) {
for (MxS16 i = 0; i < 5; i++) { for (MxS16 i = 0; i < 5; i++) {
m_unk0x08[i].ReadFromFile(p_file); p_file->Read(m_unk0x08[i].m_nextIndex);
} }
} }
else { else {
for (MxS16 i = 0; i < 5; i++) { for (MxS16 i = 0; i < 5; i++) {
m_unk0x08[i].WriteToFile(p_file); p_file->Write(m_unk0x08[i].m_nextIndex);
} }
} }

2
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@@ -2943,7 +2943,7 @@ MxResult AnimState::Serialize(LegoFile* p_file)
// LegoState::Serialize(p_file); // LegoState::Serialize(p_file);
// Option 2: // Option 2:
if (p_file->IsWriteMode()) { if (p_file->IsWriteMode()) {
p_file->WriteString(ClassName()); p_file->Write(MxString(ClassName()));
} }
if (p_file->IsReadMode()) { if (p_file->IsReadMode()) {

4
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@@ -743,7 +743,7 @@ void WriteDefaultTexture(LegoFile* p_file, const char* p_name)
LegoTexture texture; LegoTexture texture;
texture.SetImage(image); texture.SetImage(image);
p_file->WriteString(name); p_file->Write(MxString(name));
texture.Write(p_file); texture.Write(p_file);
} }
else { else {
@@ -760,7 +760,7 @@ void WriteDefaultTexture(LegoFile* p_file, const char* p_name)
// FUNCTION: LEGO1 0x1003f8a0 // FUNCTION: LEGO1 0x1003f8a0
void WriteNamedTexture(LegoFile* p_file, LegoNamedTexture* p_namedTexture) void WriteNamedTexture(LegoFile* p_file, LegoNamedTexture* p_namedTexture)
{ {
p_file->WriteString(*p_namedTexture->GetName()); p_file->Write(MxString(*p_namedTexture->GetName()));
p_namedTexture->GetTexture()->Write(p_file); p_namedTexture->GetTexture()->Write(p_file);
} }

32
LEGO1/lego/sources/misc/legostorage.h
View File

@@ -132,16 +132,34 @@ public:
return this; return this;
} }
// FUNCTION: LEGO1 0x10006030 // FUNCTION: BETA10 0x10024680
LegoStorage* WriteString(MxString p_str) LegoStorage* Read(LegoS16& p_data)
{ {
const char* data = p_str.GetData(); Read(&p_data, sizeof(p_data));
LegoU32 fullLength = strlen(data); return this;
}
LegoU16 limitedLength = (LegoU16) fullLength; // FUNCTION: LEGO1 0x10006030
Write(&limitedLength, sizeof(limitedLength)); // FUNCTION: BETA10 0x10017bb0
Write((char*) data, (LegoS16) fullLength); LegoStorage* Write(MxString p_data)
{
Write(p_data.GetData());
return this;
}
// FUNCTION: BETA10 0x10017c80
LegoStorage* Write(const char* p_data)
{
LegoS16 length = strlen(p_data);
Write(length);
Write(p_data, length);
return this;
}
// FUNCTION: BETA10 0x10017ce0
LegoStorage* Write(LegoS16 p_data)
{
Write(&p_data, sizeof(p_data));
return this; return this;
} }