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

Match Serialize functions to BETA10 (#1334)

Browse Source 
* Begin refactor Serialize functions

* Match more Serialize functions

* Match `LegoVehicleBuildState::Serialize`

* Match `LegoGameState::Username::Serialize`

* Match `LegoGameState::ScoreItem::Serialize`

* Match `LegoGameState::History::Serialize`

* Var name

* Var name

* Revert "Var name"

This reverts commit 1c0cccfba7.

* Add other Serialize implementations

* Add remaining Serialize implementations

* Add Read for char*

* Improvements
This commit is contained in:
Christian Semmler
2025-01-15 16:52:29 -07:00
committed by GitHub
parent f95eedd0ce
commit 77a3dc0795
20 changed files with 409 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
LEGO1/lego/legoomni/src/worlds/gasstation.cpp
View File

@@ -513,18 +513,18 @@ MxResult GasStationState::Serialize(LegoFile* p_file)
LegoState::Serialize(p_file);
if (p_file->IsWriteMode()) {
Write(p_file, m_pepperAction);
Write(p_file, m_mamaAction);
Write(p_file, m_papaAction);
Write(p_file, m_nickAction);
Write(p_file, m_lauraAction);
p_file->Write(m_pepperAction);
p_file->Write(m_mamaAction);
p_file->Write(m_papaAction);
p_file->Write(m_nickAction);
p_file->Write(m_lauraAction);
}
else if (p_file->IsReadMode()) {
Read(p_file, &m_pepperAction);
Read(p_file, &m_mamaAction);
Read(p_file, &m_papaAction);
Read(p_file, &m_nickAction);
Read(p_file, &m_lauraAction);
p_file->Read(m_pepperAction);
p_file->Read(m_mamaAction);
p_file->Read(m_papaAction);
p_file->Read(m_nickAction);
p_file->Read(m_lauraAction);
}
return SUCCESS;

25
LEGO1/lego/legoomni/src/worlds/hospital.cpp
View File

@@ -694,25 +694,26 @@ HospitalState::HospitalState()
}
// FUNCTION: LEGO1 0x10076530
// FUNCTION: BETA10 0x1002db26
MxResult HospitalState::Serialize(LegoFile* p_file)
{
LegoState::Serialize(p_file);
if (p_file->IsWriteMode()) {
Write(p_file, m_unk0x0c);
Write(p_file, m_unk0x0e);
Write(p_file, m_unk0x10);
Write(p_file, m_unk0x12);
Write(p_file, m_unk0x14);
Write(p_file, m_unk0x16);
p_file->Write(m_unk0x0c);
p_file->Write(m_unk0x0e);
p_file->Write(m_unk0x10);
p_file->Write(m_unk0x12);
p_file->Write(m_unk0x14);
p_file->Write(m_unk0x16);
}
else if (p_file->IsReadMode()) {
Read(p_file, &m_unk0x0c);
Read(p_file, &m_unk0x0e);
Read(p_file, &m_unk0x10);
Read(p_file, &m_unk0x12);
Read(p_file, &m_unk0x14);
Read(p_file, &m_unk0x16);
p_file->Read(m_unk0x0c);
p_file->Read(m_unk0x0e);
p_file->Read(m_unk0x10);
p_file->Read(m_unk0x12);
p_file->Read(m_unk0x14);
p_file->Read(m_unk0x16);
}
return SUCCESS;

96
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@@ -1337,82 +1337,83 @@ MxResult Act1State::Serialize(LegoFile* p_file)
m_racecarPlane.Serialize(p_file);
if (p_file->IsWriteMode()) {
if (m_helicopterPlane.IsPresent()) {
if (m_helicopterWindshield) {
WriteNamedTexture(p_file, m_helicopterWindshield);
}
else {
// TODO: Seems to match better when using strcmp directly instead of IsPresent
if (strcmp(m_helicopterPlane.m_name.GetData(), "")) {
if (!m_helicopterWindshield) {
WriteDefaultTexture(p_file, "chwind.gif");
}
if (m_helicopterJetLeft) {
WriteNamedTexture(p_file, m_helicopterJetLeft);
}
else {
WriteNamedTexture(p_file, m_helicopterWindshield);
}
if (!m_helicopterJetLeft) {
WriteDefaultTexture(p_file, "chjetl.gif");
}
if (m_helicopterJetRight) {
WriteNamedTexture(p_file, m_helicopterJetRight);
}
else {
WriteNamedTexture(p_file, m_helicopterJetLeft);
}
if (!m_helicopterJetRight) {
WriteDefaultTexture(p_file, "chjetr.gif");
}
else {
WriteNamedTexture(p_file, m_helicopterJetRight);
}
}
if (m_jetskiPlane.IsPresent()) {
if (m_jetskiFront) {
WriteNamedTexture(p_file, m_jetskiFront);
}
else {
if (strcmp(m_jetskiPlane.m_name.GetData(), "")) {
if (!m_jetskiFront) {
WriteDefaultTexture(p_file, "jsfrnt.gif");
}
if (m_jetskiWindshield) {
WriteNamedTexture(p_file, m_jetskiWindshield);
}
else {
WriteNamedTexture(p_file, m_jetskiFront);
}
if (!m_jetskiWindshield) {
WriteDefaultTexture(p_file, "jswnsh.gif");
}
else {
WriteNamedTexture(p_file, m_jetskiWindshield);
}
}
if (m_dunebuggyPlane.IsPresent()) {
if (m_dunebuggyFront) {
WriteNamedTexture(p_file, m_dunebuggyFront);
}
else {
if (strcmp(m_dunebuggyPlane.m_name.GetData(), "")) {
if (!m_dunebuggyFront) {
WriteDefaultTexture(p_file, "dbfrfn.gif");
}
else {
WriteNamedTexture(p_file, m_dunebuggyFront);
}
}
if (m_racecarPlane.IsPresent()) {
if (m_racecarFront) {
WriteNamedTexture(p_file, m_racecarFront);
}
else {
if (strcmp(m_racecarPlane.m_name.GetData(), "")) {
if (!m_racecarFront) {
WriteDefaultTexture(p_file, "rcfrnt.gif");
}
if (m_racecarBack) {
WriteNamedTexture(p_file, m_racecarBack);
}
else {
WriteNamedTexture(p_file, m_racecarFront);
}
if (!m_racecarBack) {
WriteDefaultTexture(p_file, "rcback.gif");
}
else {
WriteNamedTexture(p_file, m_racecarBack);
}
if (m_racecarTail) {
WriteNamedTexture(p_file, m_racecarTail);
if (!m_racecarTail) {
WriteDefaultTexture(p_file, "rctail.gif");
}
else {
WriteDefaultTexture(p_file, "rctail.gif");
WriteNamedTexture(p_file, m_racecarTail);
}
}
m_cptClickDialogue.WriteToFile(p_file);
Write(p_file, m_unk0x022);
p_file->Write(m_cptClickDialogue.m_nextIndex);
p_file->Write(m_unk0x022);
}
else if (p_file->IsReadMode()) {
if (m_helicopterPlane.IsPresent()) {
if (strcmp(m_helicopterPlane.m_name.GetData(), "")) {
m_helicopterWindshield = ReadNamedTexture(p_file);
if (m_helicopterWindshield == NULL) {
return FAILURE;
@@ -1429,7 +1430,7 @@ MxResult Act1State::Serialize(LegoFile* p_file)
}
}
if (m_jetskiPlane.IsPresent()) {
if (strcmp(m_jetskiPlane.m_name.GetData(), "")) {
m_jetskiFront = ReadNamedTexture(p_file);
if (m_jetskiFront == NULL) {
return FAILURE;
@@ -1441,14 +1442,14 @@ MxResult Act1State::Serialize(LegoFile* p_file)
}
}
if (m_dunebuggyPlane.IsPresent()) {
if (strcmp(m_dunebuggyPlane.m_name.GetData(), "")) {
m_dunebuggyFront = ReadNamedTexture(p_file);
if (m_dunebuggyFront == NULL) {
return FAILURE;
}
}
if (m_racecarPlane.IsPresent()) {
if (strcmp(m_racecarPlane.m_name.GetData(), "")) {
m_racecarFront = ReadNamedTexture(p_file);
if (m_racecarFront == NULL) {
return FAILURE;
@@ -1465,11 +1466,10 @@ MxResult Act1State::Serialize(LegoFile* p_file)
}
}
m_cptClickDialogue.ReadFromFile(p_file);
Read(p_file, &m_unk0x022);
p_file->Read(m_cptClickDialogue.m_nextIndex);
p_file->Read(m_unk0x022);
}
// TODO
return SUCCESS;
}

5
LEGO1/lego/legoomni/src/worlds/police.cpp
View File

@@ -208,15 +208,16 @@ PoliceState::PoliceState()
}
// FUNCTION: LEGO1 0x1005e990
// FUNCTION: BETA10 0x100f08b0
MxResult PoliceState::Serialize(LegoFile* p_file)
{
LegoState::Serialize(p_file);
if (p_file->IsReadMode()) {
Read(p_file, &m_policeScript);
p_file->Read((MxS32&) m_policeScript);
}
else {
Write(p_file, m_policeScript);
p_file->Write((MxS32) m_policeScript);
}
return SUCCESS;