diff --git a/Runtime/MP1/CPauseScreenBase.cpp b/Runtime/MP1/CPauseScreenBase.cpp index eb1b06278..1f9e662c8 100644 --- a/Runtime/MP1/CPauseScreenBase.cpp +++ b/Runtime/MP1/CPauseScreenBase.cpp @@ -1,5 +1,7 @@ #include "Runtime/MP1/CPauseScreenBase.hpp" +#include + #include "Runtime/CGameState.hpp" #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Audio/CSfxManager.hpp" @@ -252,11 +254,12 @@ void CPauseScreenBase::ChangeMode(EMode mode, bool playSfx) { } void CPauseScreenBase::UpdateSideTable(CGuiTableGroup* table) { - if (!table) + if (!table) { return; + } - zeus::CColor selColor = zeus::skWhite; - zeus::CColor deselColor = {1.f, 1.f, 1.f, 0.5f}; + constexpr zeus::CColor selColor = zeus::skWhite; + constexpr zeus::CColor deselColor = {1.f, 1.f, 1.f, 0.5f}; bool tableActive = true; if (table == x84_tablegroup_rightlog && x10_mode != EMode::RightTable) @@ -520,9 +523,13 @@ void CPauseScreenBase::OnWidgetScroll(CGuiWidget* widget, const boo::SScrollDelt } } -static const char* PaneSuffixes[] = {"0", "1", "2", "3", "01", "12", "23", "012", "123", "0123", - "4", "5", "6", "7", "45", "56", "67", "456", "567", "4567"}; +std::string CPauseScreenBase::GetImagePaneName(u32 i) { + static constexpr std::array PaneSuffixes{ + "0", "1", "2", "3", "01", "12", "23", "012", "123", "0123", + "4", "5", "6", "7", "45", "56", "67", "456", "567", "4567", + }; -std::string CPauseScreenBase::GetImagePaneName(u32 i) { return fmt::format(fmt("imagepane_pane{}"), PaneSuffixes[i]); } + return fmt::format(fmt("imagepane_pane{}"), PaneSuffixes[i]); +} } // namespace urde::MP1