This commit is contained in:
Christian Semmler 2024-02-27 14:10:14 -05:00
parent 2e2e887428
commit da050a3e43

View File

@ -178,23 +178,27 @@ void LegoGameState::ResetROI()
// FUNCTION: LEGO1 0x10039980 // FUNCTION: LEGO1 0x10039980
MxResult LegoGameState::Save(MxULong p_slot) MxResult LegoGameState::Save(MxULong p_slot)
{ {
MxResult result;
InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState"); InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
if (!infocenterState || !infocenterState->HasRegistered()) { if (!infocenterState || !infocenterState->HasRegistered()) {
return SUCCESS; return SUCCESS;
} }
else {
result = FAILURE;
MxResult result = FAILURE;
LegoFile fileStream; LegoFile fileStream;
MxVariableTable* variableTable = VariableTable(); MxVariableTable* variableTable = VariableTable();
MxS16 count = 0; MxS16 count = 0;
MxU32 i;
MxS32 j;
MxU16 area;
MxString savePath; MxString savePath;
GetFileSavePath(&savePath, p_slot); GetFileSavePath(&savePath, p_slot);
if (fileStream.Open(savePath.GetData(), LegoFile::c_write) != FAILURE) { if (fileStream.Open(savePath.GetData(), LegoFile::c_write) == FAILURE) {
goto done;
}
{ {
MxU32 version = 0x1000C; MxU32 version = 0x1000C;
((LegoStorage*) &fileStream)->Write(&version, sizeof(version)); ((LegoStorage*) &fileStream)->Write(&version, sizeof(version));
@ -215,21 +219,26 @@ MxResult LegoGameState::Save(MxULong p_slot)
((LegoStorage*) &fileStream)->Write(&actorId, sizeof(actorId)); ((LegoStorage*) &fileStream)->Write(&actorId, sizeof(actorId));
} }
for (MxU32 i = 0; i < _countof(g_colorSaveData); i++) { for (i = 0; i < _countof(g_colorSaveData); i++) {
if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) { if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) {
return result; goto done;
} }
} }
if (WriteVariable(&fileStream, variableTable, "backgroundcolor") != FAILURE) { if (WriteVariable(&fileStream, variableTable, "backgroundcolor") == FAILURE) {
if (WriteVariable(&fileStream, variableTable, "lightposition") != FAILURE) { goto done;
}
if (WriteVariable(&fileStream, variableTable, "lightposition") == FAILURE) {
goto done;
}
WriteEndOfVariables(&fileStream); WriteEndOfVariables(&fileStream);
UnkSaveDataWriter()->WriteSaveData3(&fileStream); UnkSaveDataWriter()->WriteSaveData3(&fileStream);
PlantManager()->Save(&fileStream); PlantManager()->Save(&fileStream);
result = BuildingManager()->Save(&fileStream); result = BuildingManager()->Save(&fileStream);
for (MxS32 i = 0; i < m_stateCount; i++) { for (j = 0; j < m_stateCount; j++) {
if (m_stateArray[i]->VTable0x14()) { if (m_stateArray[j]->VTable0x14()) {
count++; count++;
} }
} }
@ -239,21 +248,18 @@ MxResult LegoGameState::Save(MxULong p_slot)
((LegoStorage*) &fileStream)->Write(&c, sizeof(c)); ((LegoStorage*) &fileStream)->Write(&c, sizeof(c));
} }
for (MxS32 j = 0; j < m_stateCount; j++) { for (j = 0; j < m_stateCount; j++) {
if (m_stateArray[j]->VTable0x14()) { if (m_stateArray[j]->VTable0x14()) {
m_stateArray[j]->VTable0x1c(&fileStream); m_stateArray[j]->VTable0x1c(&fileStream);
} }
} }
MxU16 area = m_unk0x42c; area = m_unk0x42c;
Write(&fileStream, &area); Write(&fileStream, &area);
SerializeScoreHistory(2); SerializeScoreHistory(2);
m_isDirty = FALSE; m_isDirty = FALSE;
}
}
}
}
done:
return result; return result;
} }