From b76bdabc758b62992ad826cd1b69d8ba8587d571 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 1 Jun 2024 13:12:42 +0200 Subject: [PATCH] chore: use std::optional value_or --- .../Leaderboard/JsonLeaderboardDefLoader.cpp | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/ObjLoading/Game/IW4/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/IW4/Leaderboard/JsonLeaderboardDefLoader.cpp index 3a90565d..12ddbe8e 100644 --- a/src/ObjLoading/Game/IW4/Leaderboard/JsonLeaderboardDefLoader.cpp +++ b/src/ObjLoading/Game/IW4/Leaderboard/JsonLeaderboardDefLoader.cpp @@ -45,15 +45,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()); @@ -62,11 +55,7 @@ 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; return true; @@ -76,15 +65,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()) {