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

CFrontEndUI work

Browse Source
This commit is contained in:
Jack Andersen
2017-01-08 17:44:00 -10:00
parent ef43c3319b
commit 4c09493a3f
19 changed files with 938 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/MP1/CSaveUI.cpp
View File

@@ -125,7 +125,7 @@ bool CSaveUI::PumpLoad()
x58_tablegroup_choices->SetMenuAdvanceCallback(
std::bind(&CSaveUI::DoAdvance, this, std::placeholders::_1));
x58_tablegroup_choices->SetMenuSelectionChangeCallback(
std::bind(&CSaveUI::DoSelectionChange, this, std::placeholders::_1));
std::bind(&CSaveUI::DoSelectionChange, this, std::placeholders::_1, std::placeholders::_2));
if (x0_saveCtx == ESaveContext::InGame)
x6c_cardDriver->StartCardProbe();
@@ -160,7 +160,7 @@ CSaveUI::EUIType CSaveUI::SelectUIType() const
{
if (x6c_cardDriver->x14_error == CMemoryCardDriver::EError::CardStillFull)
return EUIType::StillInsufficientSpace;
return EUIType::SaveProgress;
return EUIType::SaveReady;
}
if (x6c_cardDriver->x14_error == CMemoryCardDriver::EError::CardBroken)
@@ -293,7 +293,7 @@ void CSaveUI::SetUIText()
opt0 = 16; // Continue
opt1 = 21; // Cancel
break;
case EUIType::SaveProgress:
case EUIType::SaveReady:
if (x0_saveCtx == ESaveContext::InGame)
{
msgB = 8; // Save progress?
@@ -330,10 +330,10 @@ void CSaveUI::SetUIText()
std::wstring opt3Str;
x68_textpane_choice3->TextSupport()->SetText(opt3Str);
x5c_textpane_choice0->SetB627(opt0 != -1);
x60_textpane_choice1->SetB627(opt1 != -1);
x64_textpane_choice2->SetB627(opt2 != -1);
x68_textpane_choice3->SetB627(false);
x5c_textpane_choice0->SetIsSelectable(opt0 != -1);
x60_textpane_choice1->SetIsSelectable(opt1 != -1);
x64_textpane_choice2->SetIsSelectable(opt2 != -1);
x68_textpane_choice3->SetIsSelectable(false);
x58_tablegroup_choices->SetIsActive(opt0 != -1 || opt1 != -1 || opt2 != -1);
SetUIColors();
@@ -567,7 +567,7 @@ void CSaveUI::DoAdvance(CGuiTableGroup* caller)
}
break;
case EUIType::SaveProgress:
case EUIType::SaveReady:
if (x0_saveCtx == ESaveContext::InGame)
{
if (userSel == 0)
@@ -592,7 +592,7 @@ void CSaveUI::DoAdvance(CGuiTableGroup* caller)
CSfxManager::SfxStart(sfx, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
}
void CSaveUI::DoSelectionChange(CGuiTableGroup* caller)
void CSaveUI::DoSelectionChange(CGuiTableGroup* caller, int userSel)
{
SetUIColors();
CSfxManager::SfxStart(x88_navMoveSfx, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);