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

Update fmtlib

Browse Source
This commit is contained in:
Jack Andersen
2020-04-11 12:51:39 -10:00
parent 7055b6983f
commit 5b4441ac36
156 changed files with 786 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/MP1/CPauseScreen.cpp
View File

@@ -224,17 +224,17 @@ void CPauseScreen::ProcessControllerInput(const CStateManager& mgr, const CFinal
}
x38_textpane_l1->TextSupport().SetText(
fmt::format(fmt("&image={};"), g_tweakPlayerRes->x74_lTrigger[
fmt::format(FMT_STRING("&image={};"), g_tweakPlayerRes->x74_lTrigger[
ControlMapper::GetDigitalInput(ControlMapper::ECommands::PreviousPauseScreen, useInput) || m_lDown]));
x3c_textpane_r->TextSupport().SetText(
fmt::format(fmt("&image={};"), g_tweakPlayerRes->x80_rTrigger[
fmt::format(FMT_STRING("&image={};"), g_tweakPlayerRes->x80_rTrigger[
ControlMapper::GetDigitalInput(ControlMapper::ECommands::NextPauseScreen, useInput) || m_rDown]));
x48_textpane_return->TextSupport().SetText(
fmt::format(fmt("&image={};"), g_tweakPlayerRes->x8c_startButton[useInput.DStart() || m_returnDown]));
fmt::format(FMT_STRING("&image={};"), g_tweakPlayerRes->x8c_startButton[useInput.DStart() || m_returnDown]));
x50_textpane_back->TextSupport().SetText(
fmt::format(fmt("&image={};"), g_tweakPlayerRes->x98_aButton[useInput.DA() || m_backDown]));
fmt::format(FMT_STRING("&image={};"), g_tweakPlayerRes->x98_aButton[useInput.DA() || m_backDown]));
x4c_textpane_next->TextSupport().SetText(
fmt::format(fmt("&image={};"), g_tweakPlayerRes->xa4_bButton[useInput.DB() || m_nextDown]));
fmt::format(FMT_STRING("&image={};"), g_tweakPlayerRes->xa4_bButton[useInput.DB() || m_nextDown]));
}
void CPauseScreen::TransitionComplete() {