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

Merge pull request #199 from Laupetin/fix/iw5-leaderboard-col-ids

Browse Source 
fix: iw4/iw5 leaderboard column ids
This commit is contained in:
Jan 2024-05-19 13:49:53 +02:00 committed by GitHub
commit d36ec97295
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ObjCommon/Game/IW4/Leaderboard/JsonLeaderboardDef.h
View File

@ -34,7 +34,7 @@ namespace IW4
{ {
public: public:
std::string name; std::string name;
int id; int colId;
int propertyId; int propertyId;
bool hidden; bool hidden;
std::string statName; std::string statName;
@ -43,7 +43,7 @@ namespace IW4
LbAggType aggregationFunction; 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 class JsonLeaderboardDef
{ {

4
src/ObjCommon/Game/IW5/Leaderboard/JsonLeaderboardDef.h
View File

@ -54,7 +54,7 @@ namespace IW5
{ {
public: public:
std::string name; std::string name;
int id; int colId;
std::optional<int> propertyId; std::optional<int> propertyId;
std::optional<bool> hidden; std::optional<bool> hidden;
std::optional<std::string> statName; std::optional<std::string> statName;
@ -65,7 +65,7 @@ namespace IW5
std::optional<int> uiCalColY; std::optional<int> 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 class JsonLeaderboardDef
{ {

6
src/ObjWriting/Game/IW4/Leaderboard/JsonLeaderboardDefWriter.cpp
View File

@ -36,7 +36,7 @@ namespace
static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef) static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef)
{ {
jColumnDef.name = lbColumnDef.name; jColumnDef.name = lbColumnDef.name;
jColumnDef.id = lbColumnDef.id; jColumnDef.colId = lbColumnDef.id;
if (lbColumnDef.propertyId != 0) if (lbColumnDef.propertyId != 0)
jColumnDef.propertyId = lbColumnDef.propertyId; jColumnDef.propertyId = lbColumnDef.propertyId;
@ -59,9 +59,9 @@ namespace
{ {
jLeaderboardDef.id = leaderboardDef.id; jLeaderboardDef.id = leaderboardDef.id;
if (leaderboardDef.xpColId != 0) if (leaderboardDef.xpColId >= 0)
jLeaderboardDef.xpColId = leaderboardDef.xpColId; jLeaderboardDef.xpColId = leaderboardDef.xpColId;
if (leaderboardDef.prestigeColId != 0) if (leaderboardDef.prestigeColId >= 0)
jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId; jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId;
jLeaderboardDef.columns.resize(leaderboardDef.columnCount); jLeaderboardDef.columns.resize(leaderboardDef.columnCount);

6
src/ObjWriting/Game/IW5/Leaderboard/JsonLeaderboardDefWriter.cpp
View File

@ -36,7 +36,7 @@ namespace
static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef) static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef)
{ {
jColumnDef.name = lbColumnDef.name; jColumnDef.name = lbColumnDef.name;
jColumnDef.id = lbColumnDef.id; jColumnDef.colId = lbColumnDef.id;
if (lbColumnDef.propertyId != 0) if (lbColumnDef.propertyId != 0)
jColumnDef.propertyId = lbColumnDef.propertyId; jColumnDef.propertyId = lbColumnDef.propertyId;
@ -65,9 +65,9 @@ namespace
{ {
jLeaderboardDef.id = leaderboardDef.id; jLeaderboardDef.id = leaderboardDef.id;
if (leaderboardDef.xpColId != 0) if (leaderboardDef.xpColId >= 0)
jLeaderboardDef.xpColId = leaderboardDef.xpColId; jLeaderboardDef.xpColId = leaderboardDef.xpColId;
if (leaderboardDef.prestigeColId != 0) if (leaderboardDef.prestigeColId >= 0)
jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId; jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId;
jLeaderboardDef.columns.resize(leaderboardDef.columnCount); jLeaderboardDef.columns.resize(leaderboardDef.columnCount);