From e046089cbb6fa6d7a4c4b2d55dd232fbc27fe595 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 1 Jun 2024 13:55:00 +0200 Subject: [PATCH] chore: use std::optional value_or for iw5 leaderboard reading --- .../Leaderboard/JsonLeaderboardDefLoader.cpp | 38 ++++--------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp index b46a727d..61196dbd 100644 --- a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp +++ b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp @@ -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()) {