From 57dc081d4a89347881906e96e62820d24f17f460 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:55:20 +0100 Subject: [PATCH] Pylon: rename field "playerCount" to "numPlayers" Force consistency between code structure. --- src/networksystem/pylon.cpp | 8 ++++---- src/public/tier0/basetypes.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/networksystem/pylon.cpp b/src/networksystem/pylon.cpp index f23088dd..57a53940 100644 --- a/src/networksystem/pylon.cpp +++ b/src/networksystem/pylon.cpp @@ -34,7 +34,7 @@ static bool IsServerListingValid(const rapidjson::Value& value) value.HasMember("port") && value["port"].IsInt() && value.HasMember("key") && value["key"].IsString() && value.HasMember("checksum") && value["checksum"].IsUint() && - value.HasMember("playerCount") && value["playerCount"].IsInt() && + value.HasMember("numPlayers") && value["numPlayers"].IsInt() && value.HasMember("maxPlayers") && value["maxPlayers"].IsInt()) { return true; @@ -98,7 +98,7 @@ bool CPylon::GetServerList(vector& outServerList, string& outMe obj["key"].GetString(), obj["checksum"].GetUint(), SDK_VERSION, - obj["playerCount"].GetInt(), + obj["numPlayers"].GetInt(), obj["maxPlayers"].GetInt(), -1, } @@ -160,7 +160,7 @@ bool CPylon::GetServerByToken(NetGameServer_t& outGameServer, serverJson["key"].GetString(), serverJson["checksum"].GetUint(), SDK_VERSION, - serverJson["playerCount"].GetInt(), + serverJson["numPlayers"].GetInt(), serverJson["maxPlayers"].GetInt(), -1, }; @@ -192,7 +192,7 @@ bool CPylon::PostServerHost(string& outMessage, string& outToken, string& outHos requestJson.AddMember("key", rapidjson::Value(netGameServer.netKey.c_str(), allocator), allocator); requestJson.AddMember("checksum", netGameServer.checksum, allocator); requestJson.AddMember("version", rapidjson::Value(netGameServer.versionId.c_str(), allocator), allocator); - requestJson.AddMember("playerCount", netGameServer.numPlayers, allocator); + requestJson.AddMember("numPlayers", netGameServer.numPlayers, allocator); requestJson.AddMember("maxPlayers", netGameServer.maxPlayers, allocator); requestJson.AddMember("timeStamp", netGameServer.timeStamp, allocator); diff --git a/src/public/tier0/basetypes.h b/src/public/tier0/basetypes.h index 3787c637..a918d71b 100644 --- a/src/public/tier0/basetypes.h +++ b/src/public/tier0/basetypes.h @@ -134,7 +134,7 @@ #define MAX_MAP_NAME_HOST 64 // Max host BSP file name len. #define MAX_MAP_NAME 64 // Max BSP file name len. -#define SDK_VERSION "VGameSDK009" // Increment this with every /breaking/ SDK change (i.e. security/backend changes breaking compatibility). +#define SDK_VERSION "VGameSDK010" // Increment this with every /breaking/ SDK change (i.e. security/backend changes breaking compatibility). #define SDK_ARRAYSIZE(arr) ((sizeof(arr) / sizeof(*arr))) // Name due to IMGUI implementation and NT implementation that we shouldn't share across everywhere. #define SDK_SYSTEM_CFG_PATH "cfg/system/"