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

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Runtime/MP1/CStateSetterFlow.cpp
View File

@@ -2,56 +2,46 @@
#include "CArchitectureMessage.hpp"
#include "GameGlobalObjects.hpp"
#include "MP1.hpp"
namespace urde::MP1
{
namespace urde::MP1 {
CStateSetterFlow::CStateSetterFlow()
: CIOWin("") {}
CStateSetterFlow::CStateSetterFlow() : CIOWin("") {}
CIOWin::EMessageReturn CStateSetterFlow::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue)
{
if (msg.GetType() == EArchMsgType::TimerTick)
{
MP1::CMain* m = static_cast<MP1::CMain*>(g_Main);
CIOWin::EMessageReturn CStateSetterFlow::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) {
if (msg.GetType() == EArchMsgType::TimerTick) {
MP1::CMain* m = static_cast<MP1::CMain*>(g_Main);
if (m->m_warpWorldIdx > -1)
{
CResLoader* loader = g_ResFactory->GetResLoader();
CAssetId worldId;
for (const auto& pak : loader->GetPaks())
{
if (*(pak->GetPath().end() - 6) == '0' + m->m_warpWorldIdx)
{
worldId = pak->GetMLVLId();
break;
}
}
if (worldId.IsValid())
{
m->ResetGameState();
g_GameState->SetCurrentWorldId(worldId);
CWorldLayerState& layers = *g_GameState->StateForWorld(worldId).GetLayerState();
if (m->m_warpAreaId < layers.GetAreaCount())
{
g_GameState->StateForWorld(worldId).SetAreaId(m->m_warpAreaId);
if (m->m_warpLayerBits)
{
for (u32 i = 0; i < layers.GetAreaLayerCount(m->m_warpAreaId); ++i)
layers.SetLayerActive(m->m_warpAreaId, i, ((m->m_warpLayerBits >> i) & 1) != 0);
}
}
g_GameState->GameOptions().ResetToDefaults();
g_GameState->WriteBackupBuf();
return EMessageReturn::RemoveIOWinAndExit;
}
if (m->m_warpWorldIdx > -1) {
CResLoader* loader = g_ResFactory->GetResLoader();
CAssetId worldId;
for (const auto& pak : loader->GetPaks()) {
if (*(pak->GetPath().end() - 6) == '0' + m->m_warpWorldIdx) {
worldId = pak->GetMLVLId();
break;
}
}
m->RefreshGameState();
if (worldId.IsValid()) {
m->ResetGameState();
g_GameState->SetCurrentWorldId(worldId);
CWorldLayerState& layers = *g_GameState->StateForWorld(worldId).GetLayerState();
if (m->m_warpAreaId < layers.GetAreaCount()) {
g_GameState->StateForWorld(worldId).SetAreaId(m->m_warpAreaId);
if (m->m_warpLayerBits) {
for (u32 i = 0; i < layers.GetAreaLayerCount(m->m_warpAreaId); ++i)
layers.SetLayerActive(m->m_warpAreaId, i, ((m->m_warpLayerBits >> i) & 1) != 0);
}
}
g_GameState->GameOptions().ResetToDefaults();
g_GameState->WriteBackupBuf();
return EMessageReturn::RemoveIOWinAndExit;
}
}
return EMessageReturn::Exit;
m->RefreshGameState();
return EMessageReturn::RemoveIOWinAndExit;
}
return EMessageReturn::Exit;
}
}
} // namespace urde::MP1