2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00

Work on CWorldTransManager

This commit is contained in:
Jack Andersen
2016-08-15 10:58:07 -10:00
parent eb7ce0b84b
commit 0dacc2233c
19 changed files with 264 additions and 108 deletions

View File

@@ -35,9 +35,9 @@ void CMainFlow::SetGameState(EClientFlowStates state, CArchitectureQueue& queue)
{
case EClientFlowStates::FrontEnd:
{
if (g_main->GetGameplayResult() == EGameplayResult::None)
if (g_Main->GetGameplayResult() == EGameplayResult::None)
{
g_main->SetGameplayResult(EGameplayResult::Playing);
g_Main->SetGameplayResult(EGameplayResult::Playing);
break;
}
/* TODO: URDE handling
@@ -45,8 +45,8 @@ void CMainFlow::SetGameState(EClientFlowStates state, CArchitectureQueue& queue)
while (!loader.AreAllPaksLoaded())
loader.AsyncIdlePakLoading();
*/
g_main->LoadAudio();
g_main->RegisterResourceTweaks();
g_Main->LoadAudio();
g_Main->RegisterResourceTweaks();
queue.Push(std::move(MakeMsg::CreateCreateIOWin(EArchMsgTarget::IOWinManager, 12, 11, new CFrontEndUI())));
break;
}
@@ -57,7 +57,7 @@ void CMainFlow::SetGameState(EClientFlowStates state, CArchitectureQueue& queue)
}
case EClientFlowStates::MoviePlay:
{
switch (g_main->GetGameplayResult())
switch (g_Main->GetGameplayResult())
{
case EGameplayResult::Win:
queue.Push(std::move(MakeMsg::CreateCreateIOWin(EArchMsgTarget::IOWinManager, 12, 11, new CPlayMovie(CPlayMovie::EWhichMovie::WinGame))));