From abc7fdd3f0ff154fbd83f1038594e23b76f87b6b Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 11 Aug 2022 08:55:46 -0700 Subject: [PATCH] Update aurora --- Runtime/CStateManager.cpp | 2 +- Runtime/CStateManager.hpp | 5 +---- extern/aurora | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Runtime/CStateManager.cpp b/Runtime/CStateManager.cpp index 7c42b70ae..e2c5ab245 100644 --- a/Runtime/CStateManager.cpp +++ b/Runtime/CStateManager.cpp @@ -81,7 +81,7 @@ CStateManager::CStateManager(const std::weak_ptr& 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; diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp index 6e484da48..26b7c15f8 100644 --- a/Runtime/CStateManager.hpp +++ b/Runtime/CStateManager.hpp @@ -157,10 +157,7 @@ private: CRandom16 x8fc_random; CRandom16* x900_activeRandom = nullptr; EGameState x904_gameState = EGameState::Running; - u32 x908_loaderCount = 0; - std::array x90c_loaderFuncs{}; - - bool xab0_worldLoaded = false; + rstl::reserved_vector x90c_loaderFuncs; enum class EInitPhase { LoadWorld, LoadFirstArea, Done } xb3c_initPhase = EInitPhase::LoadWorld; diff --git a/extern/aurora b/extern/aurora index 5f06d873b..a3d04247e 160000 --- a/extern/aurora +++ b/extern/aurora @@ -1 +1 @@ -Subproject commit 5f06d873bc25d139e5c1fe457a3e4706188c64ee +Subproject commit a3d04247e668405ff0e60e7fdcf22f09df3e4478