AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update aurora

This commit is contained in:
Phillip Stephens 2022-08-11 08:55:46 -07:00
parent cd16431d36
commit abc7fdd3f0
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/CStateManager.cpp
View File

@ -81,7 +81,7 @@ CStateManager::CStateManager(const std::weak_ptr<CScriptMailbox>& mailbox, const
x88c_rumbleManager = &x86c_stateManagerContainer->xf250_rumbleManager; x88c_rumbleManager = &x86c_stateManagerContainer->xf250_rumbleManager;
g_Renderer->SetDrawableCallback(&CStateManager::RendererDrawCallback, this); 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::Actor)] = ScriptLoader::LoadActor;
x90c_loaderFuncs[size_t(EScriptObjectType::Waypoint)] = ScriptLoader::LoadWaypoint; x90c_loaderFuncs[size_t(EScriptObjectType::Waypoint)] = ScriptLoader::LoadWaypoint;
x90c_loaderFuncs[size_t(EScriptObjectType::Door)] = ScriptLoader::LoadDoor; x90c_loaderFuncs[size_t(EScriptObjectType::Door)] = ScriptLoader::LoadDoor;

5
Runtime/CStateManager.hpp
View File

@ -157,10 +157,7 @@ private:
CRandom16 x8fc_random; CRandom16 x8fc_random;
CRandom16* x900_activeRandom = nullptr; CRandom16* x900_activeRandom = nullptr;
EGameState x904_gameState = EGameState::Running; EGameState x904_gameState = EGameState::Running;
u32 x908_loaderCount = 0; rstl::reserved_vector<FScriptLoader, size_t(EScriptObjectType::ScriptObjectTypeMAX)> x90c_loaderFuncs;
std::array<FScriptLoader, size_t(EScriptObjectType::ScriptObjectTypeMAX)> x90c_loaderFuncs{};
bool xab0_worldLoaded = false;
enum class EInitPhase { LoadWorld, LoadFirstArea, Done } xb3c_initPhase = EInitPhase::LoadWorld; enum class EInitPhase { LoadWorld, LoadFirstArea, Done } xb3c_initPhase = EInitPhase::LoadWorld;

2
extern/aurora vendored

@ -1 +1 @@
Subproject commit 5f06d873bc25d139e5c1fe457a3e4706188c64ee Subproject commit a3d04247e668405ff0e60e7fdcf22f09df3e4478