AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CGameOption: Mark C-Pad arrays constexpr 

Allows elision of runtime initializers.
This commit is contained in:
Lioncash 2020-04-12 05:42:43 -04:00
parent 1085600f30
commit 976bf0d83e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/CGameOptions.cpp
View File

@ -331,7 +331,7 @@ void CGameOptions::SetControls(int controls) {
ResetControllerAssets(controls); ResetControllerAssets(controls);
} }
const std::array<std::pair<CAssetId, CAssetId>, 5> CStickToDPadRemap{{ constexpr std::array<std::pair<CAssetId, CAssetId>, 5> CStickToDPadRemap{{
{0x2A13C23E, 0xF13452F8}, {0x2A13C23E, 0xF13452F8},
{0xA91A7703, 0xC042EC91}, {0xA91A7703, 0xC042EC91},
{0x12A12131, 0x5F556002}, {0x12A12131, 0x5F556002},
@ -339,7 +339,7 @@ const std::array<std::pair<CAssetId, CAssetId>, 5> CStickToDPadRemap{{
{0xCD7B1ACA, 0x8ADA8184}, {0xCD7B1ACA, 0x8ADA8184},
}}; }};
const std::array<std::pair<CAssetId, CAssetId>, 5> CStickOutlineToDPadRemap{{ constexpr std::array<std::pair<CAssetId, CAssetId>, 5> CStickOutlineToDPadRemap{{
{0x1A29C0E6, 0xF13452F8}, {0x1A29C0E6, 0xF13452F8},
{0x5D9F9796, 0xC042EC91}, {0x5D9F9796, 0xC042EC91},
{0x951546A8, 0x5F556002}, {0x951546A8, 0x5F556002},