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

Initial collision testing and CStateManager work

Browse Source
This commit is contained in:
Jack Andersen
2017-03-30 12:36:18 -10:00
parent a0549cd82b
commit 2530163a8c
38 changed files with 1056 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/CMFGame.cpp
View File

@@ -105,7 +105,7 @@ CIOWin::EMessageReturn CMFGame::OnMessage(const CArchitectureMessage& msg, CArch
{
if (x14_stateManager->GetPlayer().IsPlayerDeadEnough())
{
static_cast<CMain&>(*g_Main).SetFlowState(EFlowState::Four);
static_cast<CMain&>(*g_Main).SetFlowState(EFlowState::LoseGame);
queue.Push(MakeMsg::CreateQuitGameplay(EArchMsgTarget::Game));
}
else
@@ -285,8 +285,8 @@ CMFGameLoader::CMFGameLoader() : CMFGameLoaderBase("CMFGameLoader")
CMain* m = static_cast<CMain*>(g_Main);
switch (m->GetFlowState())
{
case EFlowState::Five:
case EFlowState::Six:
case EFlowState::Default:
case EFlowState::StateSetter:
{
ResId mlvlId = g_GameState->CurrentWorldAssetId();
if (g_MemoryCardSys->HasSaveWorldMemory(mlvlId))