Implement Save, Load, DeleteState (#602)

* Implement Save, Load, DeleteState

* WIP

* WIP

* Match LegoGameState::Save

* Spacing

* Match LegoGameState::DeleteState()

* More match

* Match

* Move vars

* Other fixes

* Rename

* Fix error

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-02-27 15:04:17 -05:00
committed by GitHub
parent c0a988b0fe
commit 4d84157888
16 changed files with 300 additions and 54 deletions

View File

@@ -9,6 +9,8 @@ class LegoBackgroundColor : public MxVariable {
public:
LegoBackgroundColor(const char* p_key, const char* p_value);
void SetValue(const char* p_colorString) override;
void SetLights(float p_r, float p_g, float p_b);
void SetLights();
private:
float m_h;

View File

@@ -2,6 +2,7 @@
#define LEGOBUILDINGMANAGER_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "mxcore.h"
// VTABLE: LEGO1 0x100d6f50
@@ -25,6 +26,8 @@ public:
void FUN_1002fa00();
void FUN_1002fb30();
MxResult Save(LegoStorage* p_storage);
MxResult Load(LegoStorage* p_storage);
void FUN_10030590();
// SYNTHETIC: LEGO1 0x1002f940

View File

@@ -120,8 +120,9 @@ public:
LegoGameState();
~LegoGameState();
MxResult Load(MxULong);
MxResult Save(MxULong);
MxResult DeleteState();
MxResult Load(MxULong);
void SerializePlayersInfo(MxS16);
void SerializeScoreHistory(MxS16 p_flags);
void SetSavePath(char*);
@@ -152,7 +153,7 @@ public:
void SetCurrentAct(Act p_currentAct);
void FindLoadedAct();
void SetActor(MxU8 p_actorId);
void FUN_10039940();
void ResetROI();
private:
void RegisterState(LegoState* p_state);

View File

@@ -2,6 +2,7 @@
#define LEGOPLANTMANAGER_H
#include "decomp.h"
#include "lego/sources/misc/legostorage.h"
#include "mxcore.h"
// VTABLE: LEGO1 0x100d6758
@@ -22,6 +23,8 @@ public:
void FUN_10026360(MxS32 p_scriptIndex);
void FUN_100263a0(undefined4 p_und);
void Save(LegoStorage* p_storage);
MxResult Load(LegoStorage* p_storage);
void FUN_10027120();
static void SetCustomizeAnimFile(const char* p_value);

View File

@@ -56,6 +56,7 @@ public:
LegoUnkSaveDataWriter();
MxResult WriteSaveData3(LegoStorage* p_storage);
MxResult ReadSaveData3(LegoStorage* p_storage);
LegoROI* FUN_10083500(const char*, MxBool);
static void InitSaveData();

View File

@@ -41,6 +41,7 @@ void FUN_1003ef00(MxBool);
void SetAppCursor(WPARAM p_wparam);
MxBool FUN_1003ef60();
MxBool RemoveFromWorld(MxAtomId& p_atomId1, MxS32 p_id1, MxAtomId& p_atomId2, MxS32 p_id2);
void SetLightPosition(MxU32);
NamedTexture* ReadNamedTexture(LegoFile* p_file);
void FUN_1003f540(LegoFile* p_file, const char* p_filename);
void WriteNamedTexture(LegoFile* p_file, NamedTexture* p_texture);

View File

@@ -44,6 +44,18 @@ void LegoBuildingManager::FUN_1002fb30()
// TODO
}
// STUB: LEGO1 0x1002fb80
MxResult LegoBuildingManager::Save(LegoStorage* p_storage)
{
return SUCCESS;
}
// STUB: LEGO1 0x1002fc10
MxResult LegoBuildingManager::Load(LegoStorage* p_storage)
{
return SUCCESS;
}
// FUNCTION: LEGO1 0x1002ff90
void LegoBuildingManager::SetCustomizeAnimFile(const char* p_value)
{

View File

@@ -66,3 +66,16 @@ void LegoBackgroundColor::SetValue(const char* p_colorString)
delete[] colorStringCopy;
}
// STUB: LEGO1 0x1003c400
void LegoBackgroundColor::SetLights(float p_r, float p_g, float p_b)
{
}
// FUNCTION: LEGO1 0x1003c4b0
void LegoBackgroundColor::SetLights()
{
float convertedR, convertedG, convertedB;
ConvertHSVToRGB(m_h, m_s, m_v, &convertedR, &convertedG, &convertedB);
SetLights(convertedR, convertedG, convertedB);
}

View File

@@ -5,8 +5,10 @@
#include "infocenterstate.h"
#include "islepathactor.h"
#include "legoanimationmanager.h"
#include "legobuildingmanager.h"
#include "legonavcontroller.h"
#include "legoomni.h"
#include "legoplantmanager.h"
#include "legostate.h"
#include "legounksavedatawriter.h"
#include "legoutil.h"
@@ -156,58 +158,219 @@ void LegoGameState::SetActor(MxU8 p_actorId)
SetCurrentActor(newActor);
}
// STUB: LEGO1 0x10039940
void LegoGameState::FUN_10039940()
// FUNCTION: LEGO1 0x10039940
void LegoGameState::ResetROI()
{
// TODO
if (m_actorId) {
IslePathActor* actor = CurrentActor();
if (actor) {
LegoROI* roi = actor->GetROI();
if (roi) {
VideoManager()->Get3DManager()->GetLego3DView()->Remove(*roi);
VideoManager()->Get3DManager()->GetLego3DView()->Add(*roi);
}
}
}
}
// FUNCTION: LEGO1 0x10039980
MxResult LegoGameState::Save(MxULong p_slot)
{
MxResult result;
InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
if (!infocenterState || !infocenterState->HasRegistered()) {
result = SUCCESS;
return SUCCESS;
}
else {
result = FAILURE;
MxVariableTable* variableTable = VariableTable();
MxString savePath;
GetFileSavePath(&savePath, p_slot);
LegoFile fileStream;
if (fileStream.Open(savePath.GetData(), LegoFile::c_write) != FAILURE) {
MxU32 maybeVersion = 0x1000C;
fileStream.Write(&maybeVersion, 4);
fileStream.Write(&m_unk0x24, 2);
fileStream.Write(&m_currentAct, 2);
fileStream.Write(&m_actorId, 1);
for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) {
if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) {
return result;
}
}
MxResult result = FAILURE;
LegoFile fileStream;
MxVariableTable* variableTable = VariableTable();
MxS16 count = 0;
MxU32 i;
MxS32 j;
MxU16 area;
if (WriteVariable(&fileStream, variableTable, "backgroundcolor") != FAILURE) {
if (WriteVariable(&fileStream, variableTable, "lightposition") != FAILURE) {
WriteEndOfVariables(&fileStream);
MxString savePath;
GetFileSavePath(&savePath, p_slot);
// TODO: Calls down to more aggregate writing functions
return SUCCESS;
}
}
if (fileStream.Open(savePath.GetData(), LegoFile::c_write) == FAILURE) {
goto done;
}
Write(&fileStream, 0x1000c);
Write(&fileStream, m_unk0x24);
Write(&fileStream, (MxU16) m_currentAct);
Write(&fileStream, m_actorId);
for (i = 0; i < _countof(g_colorSaveData); i++) {
if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) {
goto done;
}
}
if (WriteVariable(&fileStream, variableTable, "backgroundcolor") == FAILURE) {
goto done;
}
if (WriteVariable(&fileStream, variableTable, "lightposition") == FAILURE) {
goto done;
}
WriteEndOfVariables(&fileStream);
UnkSaveDataWriter()->WriteSaveData3(&fileStream);
PlantManager()->Save(&fileStream);
result = BuildingManager()->Save(&fileStream);
for (j = 0; j < m_stateCount; j++) {
if (m_stateArray[j]->VTable0x14()) {
count++;
}
}
Write(&fileStream, count);
for (j = 0; j < m_stateCount; j++) {
if (m_stateArray[j]->VTable0x14()) {
m_stateArray[j]->VTable0x1c(&fileStream);
}
}
area = m_unk0x42c;
Write(&fileStream, (MxU16) area);
SerializeScoreHistory(2);
m_isDirty = FALSE;
done:
return result;
}
// STUB: LEGO1 0x10039c60
MxResult LegoGameState::Load(MxULong)
// FUNCTION: LEGO1 0x10039bf0
MxResult LegoGameState::DeleteState()
{
// TODO
return 0;
MxS16 stateCount = m_stateCount;
LegoState** stateArray = m_stateArray;
m_stateCount = 0;
m_stateArray = NULL;
for (MxS32 count = 0; count < stateCount; count++) {
if (!stateArray[count]->SetFlag() && stateArray[count]->VTable0x14()) {
delete stateArray[count];
}
else {
RegisterState(stateArray[count]);
stateArray[count] = NULL;
}
}
delete[] stateArray;
return SUCCESS;
}
// FUNCTION: LEGO1 0x10039c60
MxResult LegoGameState::Load(MxULong p_slot)
{
MxResult result = FAILURE;
LegoFile fileStream;
MxVariableTable* variableTable = VariableTable();
MxString savePath;
GetFileSavePath(&savePath, p_slot);
if (fileStream.Open(savePath.GetData(), LegoFile::c_read) == FAILURE) {
goto done;
}
MxU32 version, status;
MxS16 count, area, act;
const char* lightPosition;
Read(&fileStream, &version);
if (version != 0x1000c) {
OmniError("Saved game version mismatch", 0);
goto done;
}
Read(&fileStream, &m_unk0x24);
Read(&fileStream, &act);
SetCurrentAct((Act) act);
Read(&fileStream, &m_actorId);
if (m_actorId) {
SetActor(m_actorId);
}
do {
status = ReadVariable(&fileStream, variableTable);
if (status == 1) {
goto done;
}
} while (status != 2);
m_backgroundColor->SetLights();
lightPosition = VariableTable()->GetVariable("lightposition");
if (lightPosition) {
SetLightPosition(atoi(lightPosition));
}
if (UnkSaveDataWriter()->ReadSaveData3(&fileStream) == FAILURE) {
goto done;
}
if (PlantManager()->Load(&fileStream) == FAILURE) {
goto done;
}
if (BuildingManager()->Load(&fileStream) == FAILURE) {
goto done;
}
if (DeleteState() != SUCCESS) {
goto done;
}
char stateName[80];
Read(&fileStream, &count);
if (count) {
for (MxS16 i = 0; i < count; i++) {
MxS16 stateNameLength;
Read(&fileStream, &stateNameLength);
Read(&fileStream, stateName, (MxULong) stateNameLength);
stateName[stateNameLength] = 0;
LegoState* state = GetState(stateName);
if (!state) {
state = CreateState(stateName);
if (!state) {
goto done;
}
}
state->VTable0x1c(&fileStream);
}
}
Read(&fileStream, &area);
if (m_currentAct == 0) {
m_unk0x42c = e_noArea;
}
else {
m_unk0x42c = (Area) area;
}
result = SUCCESS;
m_isDirty = FALSE;
done:
if (result != SUCCESS) {
OmniError("Game state loading was not successful!", 0);
}
return result;
}
// FUNCTION: LEGO1 0x10039f00

View File

@@ -35,6 +35,18 @@ void LegoPlantManager::FUN_100263a0(undefined4 p_und)
// TODO
}
// STUB: LEGO1 0x10026720
void LegoPlantManager::Save(LegoStorage* p_storage)
{
// TODO
}
// STUB: LEGO1 0x100267b0
MxResult LegoPlantManager::Load(LegoStorage* p_storage)
{
return SUCCESS;
}
// FUNCTION: LEGO1 0x10026be0
void LegoPlantManager::SetCustomizeAnimFile(const char* p_value)
{

View File

@@ -90,6 +90,12 @@ MxResult LegoUnkSaveDataWriter::WriteSaveData3(LegoStorage* p_storage)
return result;
}
// STUB: LEGO1 0x100833f0
MxResult LegoUnkSaveDataWriter::ReadSaveData3(LegoStorage* p_storage)
{
return SUCCESS;
}
// STUB: LEGO1 0x10083500
LegoROI* LegoUnkSaveDataWriter::FUN_10083500(const char* p_key, MxBool p_option)
{

View File

@@ -291,6 +291,11 @@ MxBool FUN_1003ef60()
return TRUE;
}
// STUB: LEGO1 0x1003f0d0
void SetLightPosition(MxU32)
{
}
// STUB: LEGO1 0x1003f3b0
NamedTexture* ReadNamedTexture(LegoFile* p_file)
{

View File

@@ -581,7 +581,7 @@ void LegoWorld::Enable(MxBool p_enable)
AnimationManager()->FUN_1005f0b0();
}
GameState()->FUN_10039940();
GameState()->ResetROI();
SetIsWorldActive(TRUE);
}
}