mirror of https://github.com/AxioDL/metaforce.git
Update aurora
This commit is contained in:
parent
cd16431d36
commit
abc7fdd3f0
|
@ -81,7 +81,7 @@ CStateManager::CStateManager(const std::weak_ptr<CScriptMailbox>& mailbox, const
|
|||
x88c_rumbleManager = &x86c_stateManagerContainer->xf250_rumbleManager;
|
||||
|
||||
g_Renderer->SetDrawableCallback(&CStateManager::RendererDrawCallback, this);
|
||||
x908_loaderCount = int(EScriptObjectType::ScriptObjectTypeMAX);
|
||||
x90c_loaderFuncs.resize(int(EScriptObjectType::ScriptObjectTypeMAX));
|
||||
x90c_loaderFuncs[size_t(EScriptObjectType::Actor)] = ScriptLoader::LoadActor;
|
||||
x90c_loaderFuncs[size_t(EScriptObjectType::Waypoint)] = ScriptLoader::LoadWaypoint;
|
||||
x90c_loaderFuncs[size_t(EScriptObjectType::Door)] = ScriptLoader::LoadDoor;
|
||||
|
|
|
@ -157,10 +157,7 @@ private:
|
|||
CRandom16 x8fc_random;
|
||||
CRandom16* x900_activeRandom = nullptr;
|
||||
EGameState x904_gameState = EGameState::Running;
|
||||
u32 x908_loaderCount = 0;
|
||||
std::array<FScriptLoader, size_t(EScriptObjectType::ScriptObjectTypeMAX)> x90c_loaderFuncs{};
|
||||
|
||||
bool xab0_worldLoaded = false;
|
||||
rstl::reserved_vector<FScriptLoader, size_t(EScriptObjectType::ScriptObjectTypeMAX)> x90c_loaderFuncs;
|
||||
|
||||
enum class EInitPhase { LoadWorld, LoadFirstArea, Done } xb3c_initPhase = EInitPhase::LoadWorld;
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 5f06d873bc25d139e5c1fe457a3e4706188c64ee
|
||||
Subproject commit a3d04247e668405ff0e60e7fdcf22f09df3e4478
|
Loading…
Reference in New Issue