AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-20 12:59:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into hsh

Browse Source
This commit is contained in:
Luke Street
2020-09-28 20:14:09 -04:00
parent 3827f35227 ac68aa3c76
commit f4f840cb17
647 changed files with 22984 additions and 10477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Runtime/MP1/CMFGame.cpp
View File

@@ -1,5 +1,7 @@
#include "Runtime/MP1/CMFGame.hpp"
#include <array>
#include "Runtime/CArchitectureQueue.hpp"
#include "Runtime/MP1/CSamusHud.hpp"
#include "Runtime/MP1/MP1.hpp"
@@ -16,9 +18,7 @@ CMFGame::CMFGame(const std::weak_ptr<CStateManager>& stateMgr, const std::weak_p
const CArchitectureQueue&)
: CMFGameBase("CMFGame")
, x14_stateManager(stateMgr.lock())
, x18_guiManager(guiMgr.lock())
, x2a_24_initialized(false)
, x2a_25_samusAlive(true) {
, x18_guiManager(guiMgr.lock()) {
static_cast<CMain&>(*g_Main).SetMFGameBuilt(true);
}
@@ -256,8 +256,7 @@ void CMFGame::EnterMapScreen() {
x14_stateManager->SetInMapScreen(true);
}
CMFGameLoader::CMFGameLoader()
: CMFGameLoaderBase("CMFGameLoader"), x2c_24_initialized(false), x2c_25_transitionFinished(false) {
CMFGameLoader::CMFGameLoader() : CMFGameLoaderBase("CMFGameLoader") {
auto* m = static_cast<CMain*>(g_Main);
switch (m->GetFlowState()) {
case EFlowState::Default:
@@ -286,16 +285,18 @@ CMFGameLoader::CMFGameLoader()
CMFGameLoader::~CMFGameLoader() = default;
static const char* LoadDepPAKs[] = {"TestAnim", "SamusGun", "SamGunFx", nullptr};
void CMFGameLoader::MakeLoadDependencyList() {
static constexpr std::array loadDepPAKs{"TestAnim", "SamusGun", "SamGunFx"};
std::vector<SObjectTag> tags;
for (int i = 0; LoadDepPAKs[i]; ++i)
g_ResFactory->GetTagListForFile(LoadDepPAKs[i], tags);
for (const auto* const pak : loadDepPAKs) {
g_ResFactory->GetTagListForFile(pak, tags);
}
x1c_loadList.reserve(tags.size());
for (const SObjectTag& tag : tags)
for (const SObjectTag& tag : tags) {
x1c_loadList.push_back(g_SimplePool->GetObj(tag));
}
}
CIOWin::EMessageReturn CMFGameLoader::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) {