Continued work on LegoGameState (#596)

* Continued work on LegoGameState

* Fixes/matches/refactor

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-02-26 11:19:16 -05:00
committed by GitHub
parent b524b47723
commit 124b73046b
21 changed files with 268 additions and 154 deletions

View File

@@ -179,9 +179,9 @@ LegoNavController* NavController()
}
// FUNCTION: LEGO1 0x10015790
IslePathActor* CurrentVehicle()
IslePathActor* CurrentActor()
{
return LegoOmni::GetInstance()->GetCurrentVehicle();
return LegoOmni::GetInstance()->GetCurrentActor();
}
// FUNCTION: LEGO1 0x100157a0
@@ -248,6 +248,12 @@ void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c)
}
}
// FUNCTION: LEGO1 0x10015880
void SetCurrentActor(IslePathActor* p_currentActor)
{
LegoOmni::GetInstance()->SetCurrentActor(p_currentActor);
}
// FUNCTION: LEGO1 0x100158c0
LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
{
@@ -478,7 +484,7 @@ void LegoOmni::Init()
m_worldList = NULL;
m_currentWorld = NULL;
m_exit = FALSE;
m_currentVehicle = NULL;
m_currentActor = NULL;
m_saveDataWriter = NULL;
m_plantManager = NULL;
m_gameState = NULL;