isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 11:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Christian Semmler 2024-02-28 14:47:16 -05:00
parent 1f48b7eed6
commit 2ff0b9068a
3 changed files with 66 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
#define LEGOBUILDINGMANAGER_H #define LEGOBUILDINGMANAGER_H
#include "decomp.h" #include "decomp.h"
#include "lego/sources/misc/legostorage.h" #include "misc/legostorage.h"
#include "mxcore.h" #include "mxcore.h"
// VTABLE: LEGO1 0x100d6f50 // VTABLE: LEGO1 0x100d6f50

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

@ -2,7 +2,7 @@
#define LEGOPLANTMANAGER_H #define LEGOPLANTMANAGER_H
#include "decomp.h" #include "decomp.h"
#include "lego/sources/misc/legostorage.h" #include "misc/legostorage.h"
#include "mxcore.h" #include "mxcore.h"
// VTABLE: LEGO1 0x100d6758 // VTABLE: LEGO1 0x100d6758

108
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -199,7 +199,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
} }
MxResult result = FAILURE; MxResult result = FAILURE;
LegoFile fileStream; LegoFile fileStorage;
MxVariableTable* variableTable = VariableTable(); MxVariableTable* variableTable = VariableTable();
MxS16 count = 0; MxS16 count = 0;
MxU32 i; MxU32 i;
@ -209,32 +209,32 @@ MxResult LegoGameState::Save(MxULong p_slot)
MxString savePath; MxString savePath;
GetFileSavePath(&savePath, p_slot); GetFileSavePath(&savePath, p_slot);
if (fileStream.Open(savePath.GetData(), LegoFile::c_write) == FAILURE) { if (fileStorage.Open(savePath.GetData(), LegoFile::c_write) == FAILURE) {
goto done; goto done;
} }
Write(&fileStream, 0x1000c); Write(&fileStorage, 0x1000c);
Write(&fileStream, m_unk0x24); Write(&fileStorage, m_unk0x24);
Write(&fileStream, (MxU16) m_currentAct); Write(&fileStorage, (MxU16) m_currentAct);
Write(&fileStream, m_actorId); Write(&fileStorage, m_actorId);
for (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(&fileStorage, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) {
goto done; goto done;
} }
} }
if (WriteVariable(&fileStream, variableTable, "backgroundcolor") == FAILURE) { if (WriteVariable(&fileStorage, variableTable, "backgroundcolor") == FAILURE) {
goto done; goto done;
} }
if (WriteVariable(&fileStream, variableTable, "lightposition") == FAILURE) { if (WriteVariable(&fileStorage, variableTable, "lightposition") == FAILURE) {
goto done; goto done;
} }
WriteEndOfVariables(&fileStream); WriteEndOfVariables(&fileStorage);
UnkSaveDataWriter()->WriteSaveData3(&fileStream); UnkSaveDataWriter()->WriteSaveData3(&fileStorage);
PlantManager()->Save(&fileStream); PlantManager()->Save(&fileStorage);
result = BuildingManager()->Save(&fileStream); result = BuildingManager()->Save(&fileStorage);
for (j = 0; j < m_stateCount; j++) { for (j = 0; j < m_stateCount; j++) {
if (m_stateArray[j]->VTable0x14()) { if (m_stateArray[j]->VTable0x14()) {
@ -242,16 +242,16 @@ MxResult LegoGameState::Save(MxULong p_slot)
} }
} }
Write(&fileStream, count); Write(&fileStorage, count);
for (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(&fileStorage);
} }
} }
area = m_unk0x42c; area = m_unk0x42c;
Write(&fileStream, (MxU16) area); Write(&fileStorage, (MxU16) area);
SerializeScoreHistory(2); SerializeScoreHistory(2);
m_isDirty = FALSE; m_isDirty = FALSE;
@ -286,13 +286,13 @@ MxResult LegoGameState::DeleteState()
MxResult LegoGameState::Load(MxULong p_slot) MxResult LegoGameState::Load(MxULong p_slot)
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
LegoFile fileStream; LegoFile fileStorage;
MxVariableTable* variableTable = VariableTable(); MxVariableTable* variableTable = VariableTable();
MxString savePath; MxString savePath;
GetFileSavePath(&savePath, p_slot); GetFileSavePath(&savePath, p_slot);
if (fileStream.Open(savePath.GetData(), LegoFile::c_read) == FAILURE) { if (fileStorage.Open(savePath.GetData(), LegoFile::c_read) == FAILURE) {
goto done; goto done;
} }
@ -300,25 +300,25 @@ MxResult LegoGameState::Load(MxULong p_slot)
MxS16 count, area, act; MxS16 count, area, act;
const char* lightPosition; const char* lightPosition;
Read(&fileStream, &version); Read(&fileStorage, &version);
if (version != 0x1000c) { if (version != 0x1000c) {
OmniError("Saved game version mismatch", 0); OmniError("Saved game version mismatch", 0);
goto done; goto done;
} }
Read(&fileStream, &m_unk0x24); Read(&fileStorage, &m_unk0x24);
Read(&fileStream, &act); Read(&fileStorage, &act);
SetCurrentAct((Act) act); SetCurrentAct((Act) act);
Read(&fileStream, &m_actorId); Read(&fileStorage, &m_actorId);
if (m_actorId) { if (m_actorId) {
SetActor(m_actorId); SetActor(m_actorId);
} }
do { do {
status = ReadVariable(&fileStream, variableTable); status = ReadVariable(&fileStorage, variableTable);
if (status == 1) { if (status == 1) {
goto done; goto done;
} }
@ -331,13 +331,13 @@ MxResult LegoGameState::Load(MxULong p_slot)
SetLightPosition(atoi(lightPosition)); SetLightPosition(atoi(lightPosition));
} }
if (UnkSaveDataWriter()->ReadSaveData3(&fileStream) == FAILURE) { if (UnkSaveDataWriter()->ReadSaveData3(&fileStorage) == FAILURE) {
goto done; goto done;
} }
if (PlantManager()->Load(&fileStream) == FAILURE) { if (PlantManager()->Load(&fileStorage) == FAILURE) {
goto done; goto done;
} }
if (BuildingManager()->Load(&fileStream) == FAILURE) { if (BuildingManager()->Load(&fileStorage) == FAILURE) {
goto done; goto done;
} }
if (DeleteState() != SUCCESS) { if (DeleteState() != SUCCESS) {
@ -345,13 +345,13 @@ MxResult LegoGameState::Load(MxULong p_slot)
} }
char stateName[80]; char stateName[80];
Read(&fileStream, &count); Read(&fileStorage, &count);
if (count) { if (count) {
for (MxS16 i = 0; i < count; i++) { for (MxS16 i = 0; i < count; i++) {
MxS16 stateNameLength; MxS16 stateNameLength;
Read(&fileStream, &stateNameLength); Read(&fileStorage, &stateNameLength);
Read(&fileStream, stateName, (MxULong) stateNameLength); Read(&fileStorage, stateName, (MxULong) stateNameLength);
stateName[stateNameLength] = 0; stateName[stateNameLength] = 0;
LegoState* state = GetState(stateName); LegoState* state = GetState(stateName);
@ -363,11 +363,11 @@ MxResult LegoGameState::Load(MxULong p_slot)
} }
} }
state->VTable0x1c(&fileStream); state->VTable0x1c(&fileStorage);
} }
} }
Read(&fileStream, &area); Read(&fileStorage, &area);
if (m_currentAct == 0) { if (m_currentAct == 0) {
m_unk0x42c = e_noArea; m_unk0x42c = e_noArea;
@ -411,11 +411,11 @@ MxResult LegoGameState::WriteVariable(LegoStorage* p_storage, MxVariableTable* p
if (variableValue) { if (variableValue) {
MxU8 length = strlen(p_variableName); MxU8 length = strlen(p_variableName);
if (p_storage->Write((char*) &length, 1) == SUCCESS) { if (p_storage->Write(&length, 1) == SUCCESS) {
if (p_storage->Write(p_variableName, length) == SUCCESS) { if (p_storage->Write(p_variableName, length) == SUCCESS) {
length = strlen(variableValue); length = strlen(variableValue);
if (p_storage->Write((char*) &length, 1) == SUCCESS) { if (p_storage->Write(&length, 1) == SUCCESS) {
result = p_storage->Write((char*) variableValue, length); result = p_storage->Write(variableValue, length);
} }
} }
} }
@ -442,7 +442,7 @@ MxS32 LegoGameState::ReadVariable(LegoStorage* p_storage, MxVariableTable* p_to)
MxS32 result = 1; MxS32 result = 1;
MxU8 length; MxU8 length;
if (p_storage->Read((char*) &length, 1) == SUCCESS) { if (p_storage->Read(&length, 1) == SUCCESS) {
char nameBuffer[256]; char nameBuffer[256];
if (p_storage->Read(nameBuffer, length) == SUCCESS) { if (p_storage->Read(nameBuffer, length) == SUCCESS) {
nameBuffer[length] = '\0'; nameBuffer[length] = '\0';
@ -451,7 +451,7 @@ MxS32 LegoGameState::ReadVariable(LegoStorage* p_storage, MxVariableTable* p_to)
result = 2; result = 2;
} }
else { else {
if (p_storage->Read((char*) &length, 1) == SUCCESS) { if (p_storage->Read(&length, 1) == SUCCESS) {
char valueBuffer[256]; char valueBuffer[256];
if (p_storage->Read(valueBuffer, length) == SUCCESS) { if (p_storage->Read(valueBuffer, length) == SUCCESS) {
valueBuffer[length] = '\0'; valueBuffer[length] = '\0';
@ -490,19 +490,22 @@ void LegoGameState::GetFileSavePath(MxString* p_outPath, MxU8 p_slotn)
// FUNCTION: LEGO1 0x1003a2e0 // FUNCTION: LEGO1 0x1003a2e0
void LegoGameState::SerializePlayersInfo(MxS16 p_flags) void LegoGameState::SerializePlayersInfo(MxS16 p_flags)
{ {
LegoFile fileStream; LegoFile fileStorage;
MxString playersGSI = MxString(m_savePath); MxString playersGSI = MxString(m_savePath);
playersGSI += "\\"; playersGSI += "\\";
playersGSI += g_playersGSI; playersGSI += g_playersGSI;
if (fileStream.Open(playersGSI.GetData(), p_flags) == SUCCESS) {
if (fileStream.IsReadMode()) { if (fileStorage.Open(playersGSI.GetData(), p_flags) == SUCCESS) {
Read(&fileStream, &m_playerCount); if (fileStorage.IsReadMode()) {
Read(&fileStorage, &m_playerCount);
} }
else if (fileStream.IsWriteMode()) { else if (fileStorage.IsWriteMode()) {
Write(&fileStream, m_playerCount); Write(&fileStorage, m_playerCount);
} }
for (MxS16 i = 0; i < m_playerCount; i++) { for (MxS16 i = 0; i < m_playerCount; i++) {
m_players[i].ReadWrite(&fileStream); m_players[i].ReadWrite(&fileStorage);
} }
} }
} }
@ -511,23 +514,27 @@ void LegoGameState::SerializePlayersInfo(MxS16 p_flags)
MxResult LegoGameState::AddPlayer(Username& p_player) MxResult LegoGameState::AddPlayer(Username& p_player)
{ {
MxString from, to; MxString from, to;
if (m_playerCount == 9) { if (m_playerCount == 9) {
GetFileSavePath(&from, 8); GetFileSavePath(&from, 8);
DeleteFile(from.GetData()); DeleteFile(from.GetData());
m_playerCount--; m_playerCount--;
} }
for (MxS16 i = m_playerCount; i > 0; i--) { for (MxS16 i = m_playerCount; i > 0; i--) {
m_players[i] = m_players[i - 1]; m_players[i] = m_players[i - 1];
GetFileSavePath(&from, i - 1); GetFileSavePath(&from, i - 1);
GetFileSavePath(&to, i); GetFileSavePath(&to, i);
MoveFile(from.GetData(), to.GetData()); MoveFile(from.GetData(), to.GetData());
} }
m_playerCount++; m_playerCount++;
m_players[0].Set(p_player); m_players[0].Set(p_player);
m_unk0x24 = m_history.m_unk0x372; m_unk0x24 = m_history.m_unk0x372;
m_history.m_unk0x372 = m_unk0x24 + 1; m_history.m_unk0x372 = m_unk0x24 + 1;
m_history.WriteScoreHistory(); m_history.WriteScoreHistory();
SetCurrentAct(e_act1); SetCurrentAct(e_act1);
return DeleteState(); return DeleteState();
} }
@ -536,20 +543,26 @@ void LegoGameState::SwitchPlayer(MxS16 p_playerId)
{ {
if (p_playerId > 0) { if (p_playerId > 0) {
MxString from, temp, to; MxString from, temp, to;
GetFileSavePath(&from, p_playerId); GetFileSavePath(&from, p_playerId);
GetFileSavePath(&temp, 36); GetFileSavePath(&temp, 36);
Username selectedName(m_players[p_playerId]); Username selectedName(m_players[p_playerId]);
MoveFile(from.GetData(), temp.GetData()); MoveFile(from.GetData(), temp.GetData());
for (MxS16 i = p_playerId; i > 0; i--) { for (MxS16 i = p_playerId; i > 0; i--) {
m_players[i] = m_players[i - 1]; m_players[i] = m_players[i - 1];
GetFileSavePath(&from, i - 1); GetFileSavePath(&from, i - 1);
GetFileSavePath(&to, i); GetFileSavePath(&to, i);
MoveFile(from.GetData(), to.GetData()); MoveFile(from.GetData(), to.GetData());
} }
m_players[0] = selectedName; m_players[0] = selectedName;
GetFileSavePath(&from, 0); GetFileSavePath(&from, 0);
MoveFile(temp.GetData(), from.GetData()); MoveFile(temp.GetData(), from.GetData());
} }
if (Load(0) != SUCCESS) { if (Load(0) != SUCCESS) {
Init(); Init();
} }
@ -559,10 +572,11 @@ void LegoGameState::SwitchPlayer(MxS16 p_playerId)
MxS16 LegoGameState::FindPlayer(Username& p_player) MxS16 LegoGameState::FindPlayer(Username& p_player)
{ {
for (MxS16 i = 0; i < m_playerCount; i++) { for (MxS16 i = 0; i < m_playerCount; i++) {
if (memcmp(&m_players[i], &p_player, sizeof(Username)) == 0) { if (memcmp(&m_players[i], &p_player, sizeof(p_player)) == 0) {
return i; return i;
} }
} }
return -1; return -1;
} }
@ -1042,26 +1056,31 @@ void LegoGameState::Init()
m_isDirty = FALSE; m_isDirty = FALSE;
FindLoadedAct(); FindLoadedAct();
SetCurrentAct(e_act1); SetCurrentAct(e_act1);
if (m_loadedAct == e_act1) { if (m_loadedAct == e_act1) {
Isle* isle = (Isle*) FindWorld(*g_isleScript, 0); Isle* isle = (Isle*) FindWorld(*g_isleScript, 0);
Helicopter* copter = (Helicopter*) isle->Find(*g_copterScript, 1); Helicopter* copter = (Helicopter*) isle->Find(*g_copterScript, 1);
if (copter) { if (copter) {
isle->FUN_1001fc80(copter); isle->FUN_1001fc80(copter);
isle->VTable0x6c(copter); isle->VTable0x6c(copter);
delete copter; delete copter;
} }
DuneBuggy* dunebuggy = (DuneBuggy*) isle->Find(*g_dunecarScript, 2); DuneBuggy* dunebuggy = (DuneBuggy*) isle->Find(*g_dunecarScript, 2);
if (dunebuggy) { if (dunebuggy) {
isle->FUN_1001fc80(dunebuggy); isle->FUN_1001fc80(dunebuggy);
isle->VTable0x6c(dunebuggy); isle->VTable0x6c(dunebuggy);
delete dunebuggy; delete dunebuggy;
} }
Jetski* jetski = (Jetski*) isle->Find(*g_jetskiScript, 3); Jetski* jetski = (Jetski*) isle->Find(*g_jetskiScript, 3);
if (jetski) { if (jetski) {
isle->FUN_1001fc80(jetski); isle->FUN_1001fc80(jetski);
isle->VTable0x6c(jetski); isle->VTable0x6c(jetski);
delete jetski; delete jetski;
} }
RaceCar* racecar = (RaceCar*) isle->Find(*g_racecarScript, 4); RaceCar* racecar = (RaceCar*) isle->Find(*g_racecarScript, 4);
if (racecar) { if (racecar) {
isle->FUN_1001fc80(racecar); isle->FUN_1001fc80(racecar);
@ -1069,6 +1088,7 @@ void LegoGameState::Init()
delete racecar; delete racecar;
} }
} }
m_unk0x42c = e_noArea; m_unk0x42c = e_noArea;
} }