zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use std::optional value_or for t6 leaderboard reading

Browse Source
This commit is contained in:
Jan 2024-06-01 14:23:23 +02:00
parent 9367aa889b
commit 7c5795f5bc
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ObjLoading/Game/T6/Leaderboard/JsonLeaderboardDefLoader.cpp
View File

@ -55,15 +55,8 @@ namespace
lbColumnDef.name = m_memory.Dup(jColumn.name.c_str()); lbColumnDef.name = m_memory.Dup(jColumn.name.c_str());
lbColumnDef.colId = jColumn.colId; lbColumnDef.colId = jColumn.colId;
if (jColumn.dwColIndex) lbColumnDef.dwColIndex = jColumn.dwColIndex.value_or(-1);
lbColumnDef.dwColIndex = jColumn.dwColIndex.value(); lbColumnDef.hidden = jColumn.hidden.value_or(false);
else
lbColumnDef.dwColIndex = -1;
if (jColumn.hidden)
lbColumnDef.hidden = jColumn.hidden.value();
else
lbColumnDef.hidden = false;
if (jColumn.statName) if (jColumn.statName)
lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str()); lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str());
@ -72,10 +65,7 @@ namespace
lbColumnDef.type = jColumn.type; lbColumnDef.type = jColumn.type;
if (jColumn.precision) lbColumnDef.precision = jColumn.precision.value_or(0);
lbColumnDef.precision = jColumn.precision.value();
else
lbColumnDef.precision = 0;
lbColumnDef.agg = jColumn.aggregationFunction; lbColumnDef.agg = jColumn.aggregationFunction;
@ -84,15 +74,8 @@ namespace
else else
lbColumnDef.localization = nullptr; lbColumnDef.localization = nullptr;
if (jColumn.uiCalColX) lbColumnDef.uiCalColX = jColumn.uiCalColX.value_or(0);
lbColumnDef.uiCalColX = jColumn.uiCalColX.value(); lbColumnDef.uiCalColY = jColumn.uiCalColY.value_or(0);
else
lbColumnDef.uiCalColX = 0;
if (jColumn.uiCalColY)
lbColumnDef.uiCalColY = jColumn.uiCalColY.value();
else
lbColumnDef.uiCalColY = 0;
return true; return true;
} }
@ -102,15 +85,8 @@ namespace
leaderboardDef.id = jLeaderboardDef.id; leaderboardDef.id = jLeaderboardDef.id;
leaderboardDef.dwColumnCount = jLeaderboardDef.dwColumnCount; leaderboardDef.dwColumnCount = jLeaderboardDef.dwColumnCount;
if (jLeaderboardDef.xpColId) leaderboardDef.xpColId = jLeaderboardDef.xpColId.value_or(-1);
leaderboardDef.xpColId = jLeaderboardDef.xpColId.value(); leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value_or(-1);
else
leaderboardDef.xpColId = -1;
if (jLeaderboardDef.prestigeColId)
leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value();
else
leaderboardDef.prestigeColId = -1;
if (!jLeaderboardDef.columns.empty()) if (!jLeaderboardDef.columns.empty())
{ {