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

Browse Source
This commit is contained in:
Jan 2024-06-01 13:12:42 +02:00
parent 601494e515
commit b76bdabc75
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ObjLoading/Game/IW4/Leaderboard/JsonLeaderboardDefLoader.cpp
View File

@ -45,15 +45,8 @@ namespace
{ {
lbColumnDef.name = m_memory.Dup(jColumn.name.c_str()); lbColumnDef.name = m_memory.Dup(jColumn.name.c_str());
if (jColumn.propertyId) lbColumnDef.propertyId = jColumn.propertyId.value_or(0);
lbColumnDef.propertyId = jColumn.propertyId.value(); lbColumnDef.hidden = jColumn.hidden.value_or(false);
else
lbColumnDef.propertyId = 0;
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());
@ -62,11 +55,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;
return true; return true;
@ -76,15 +65,8 @@ namespace
{ {
leaderboardDef.id = jLeaderboardDef.id; leaderboardDef.id = jLeaderboardDef.id;
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())
{ {