diff --git a/src/ObjCommon/Game/IW4/Leaderboard/JsonLeaderboardDef.h b/src/ObjCommon/Game/IW4/Leaderboard/JsonLeaderboardDef.h index b4ba09ef..82114665 100644 --- a/src/ObjCommon/Game/IW4/Leaderboard/JsonLeaderboardDef.h +++ b/src/ObjCommon/Game/IW4/Leaderboard/JsonLeaderboardDef.h @@ -34,7 +34,7 @@ namespace IW4 { public: std::string name; - int id; + int colId; int propertyId; bool hidden; std::string statName; @@ -43,7 +43,7 @@ namespace IW4 LbAggType aggregationFunction; }; - NLOHMANN_DEFINE_TYPE_EXTENSION(JsonColumnDef, name, id, propertyId, hidden, statName, type, precision, aggregationFunction); + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonColumnDef, name, colId, propertyId, hidden, statName, type, precision, aggregationFunction); class JsonLeaderboardDef { diff --git a/src/ObjCommon/Game/IW5/Leaderboard/JsonLeaderboardDef.h b/src/ObjCommon/Game/IW5/Leaderboard/JsonLeaderboardDef.h index 8b3c6687..cd2a9ccb 100644 --- a/src/ObjCommon/Game/IW5/Leaderboard/JsonLeaderboardDef.h +++ b/src/ObjCommon/Game/IW5/Leaderboard/JsonLeaderboardDef.h @@ -54,7 +54,7 @@ namespace IW5 { public: std::string name; - int id; + int colId; std::optional propertyId; std::optional hidden; std::optional statName; @@ -65,7 +65,7 @@ namespace IW5 std::optional uiCalColY; }; - NLOHMANN_DEFINE_TYPE_EXTENSION(JsonColumnDef, name, id, propertyId, hidden, statName, type, precision, aggregationFunction, uiCalColX, uiCalColY); + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonColumnDef, name, colId, propertyId, hidden, statName, type, precision, aggregationFunction, uiCalColX, uiCalColY); class JsonLeaderboardDef { diff --git a/src/ObjWriting/Game/IW4/Leaderboard/JsonLeaderboardDefWriter.cpp b/src/ObjWriting/Game/IW4/Leaderboard/JsonLeaderboardDefWriter.cpp index c6daa2d4..3523c0d6 100644 --- a/src/ObjWriting/Game/IW4/Leaderboard/JsonLeaderboardDefWriter.cpp +++ b/src/ObjWriting/Game/IW4/Leaderboard/JsonLeaderboardDefWriter.cpp @@ -36,7 +36,7 @@ namespace static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef) { jColumnDef.name = lbColumnDef.name; - jColumnDef.id = lbColumnDef.id; + jColumnDef.colId = lbColumnDef.id; if (lbColumnDef.propertyId != 0) jColumnDef.propertyId = lbColumnDef.propertyId; @@ -59,9 +59,9 @@ namespace { jLeaderboardDef.id = leaderboardDef.id; - if (leaderboardDef.xpColId != 0) + if (leaderboardDef.xpColId >= 0) jLeaderboardDef.xpColId = leaderboardDef.xpColId; - if (leaderboardDef.prestigeColId != 0) + if (leaderboardDef.prestigeColId >= 0) jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId; jLeaderboardDef.columns.resize(leaderboardDef.columnCount); diff --git a/src/ObjWriting/Game/IW5/Leaderboard/JsonLeaderboardDefWriter.cpp b/src/ObjWriting/Game/IW5/Leaderboard/JsonLeaderboardDefWriter.cpp index 51fd5703..88dcfa42 100644 --- a/src/ObjWriting/Game/IW5/Leaderboard/JsonLeaderboardDefWriter.cpp +++ b/src/ObjWriting/Game/IW5/Leaderboard/JsonLeaderboardDefWriter.cpp @@ -36,7 +36,7 @@ namespace static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef) { jColumnDef.name = lbColumnDef.name; - jColumnDef.id = lbColumnDef.id; + jColumnDef.colId = lbColumnDef.id; if (lbColumnDef.propertyId != 0) jColumnDef.propertyId = lbColumnDef.propertyId; @@ -65,9 +65,9 @@ namespace { jLeaderboardDef.id = leaderboardDef.id; - if (leaderboardDef.xpColId != 0) + if (leaderboardDef.xpColId >= 0) jLeaderboardDef.xpColId = leaderboardDef.xpColId; - if (leaderboardDef.prestigeColId != 0) + if (leaderboardDef.prestigeColId >= 0) jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId; jLeaderboardDef.columns.resize(leaderboardDef.columnCount);