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

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

Browse Source
This commit is contained in:
Jan 2024-06-01 13:55:00 +02:00
parent 1d9310fb9c
commit e046089cbb
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/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp
View File

@ -53,15 +53,8 @@ namespace
{
lbColumnDef.name = m_memory.Dup(jColumn.name.c_str());
if (jColumn.propertyId)
lbColumnDef.propertyId = jColumn.propertyId.value();
else
lbColumnDef.propertyId = 0;
if (jColumn.hidden)
lbColumnDef.hidden = jColumn.hidden.value();
else
lbColumnDef.hidden = false;
lbColumnDef.propertyId = jColumn.propertyId.value_or(0);
lbColumnDef.hidden = jColumn.hidden.value_or(false);
if (jColumn.statName)
lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str());
@ -70,22 +63,12 @@ namespace
lbColumnDef.type = jColumn.type;
if (jColumn.precision)
lbColumnDef.precision = jColumn.precision.value();
else
lbColumnDef.precision = 0;
lbColumnDef.precision = jColumn.precision.value_or(0);
lbColumnDef.agg = jColumn.aggregationFunction;
if (jColumn.uiCalColX)
lbColumnDef.uiCalColX = jColumn.uiCalColX.value();
else
lbColumnDef.uiCalColX = 0;
if (jColumn.uiCalColY)
lbColumnDef.uiCalColY = jColumn.uiCalColY.value();
else
lbColumnDef.uiCalColY = 0;
lbColumnDef.uiCalColX = jColumn.uiCalColX.value_or(0);
lbColumnDef.uiCalColY = jColumn.uiCalColY.value_or(0);
return true;
}
@ -94,15 +77,8 @@ namespace
{
leaderboardDef.id = jLeaderboardDef.id;
if (jLeaderboardDef.xpColId)
leaderboardDef.xpColId = jLeaderboardDef.xpColId.value();
else
leaderboardDef.xpColId = -1;
if (jLeaderboardDef.prestigeColId)
leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value();
else
leaderboardDef.prestigeColId = -1;
leaderboardDef.xpColId = jLeaderboardDef.xpColId.value_or(-1);
leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value_or(-1);
if (!jLeaderboardDef.columns.empty())
{