R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pylon: rename field "playerCount" to "numPlayers"

Browse Source 
Force consistency between code structure.
This commit is contained in:
Kawe Mazidjatari 2024-03-16 11:55:20 +01:00
parent 8c593f666f
commit 9d7eb7b07b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/networksystem/pylon.cpp
View File

@ -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<NetGameServer_t>& 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);

2
r5dev/public/tier0/basetypes.h
View File

@ -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/"