diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2022-11-26 10:33:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-26 04:33:39 -0500 |
| commit | 3d7e310a3253ad41707217e77c62f1d8dcbc3a8b (patch) | |
| tree | 9528666da9bddfffaaf7da184d3baded88f1ac4b /NorthstarDLL/masterserver.cpp | |
| parent | c409332991d49a1ee5911a076852452cf1890659 (diff) | |
| download | NorthstarLauncher-3d7e310a3253ad41707217e77c62f1d8dcbc3a8b.tar.gz NorthstarLauncher-3d7e310a3253ad41707217e77c62f1d8dcbc3a8b.zip | |
Parse and expose region field from JSON server list (#232)
* Add parsing region field from JSON server list
* Add function to read server region from Squirrel
* Update logic to post-refactor code
* Make region field optional
Diffstat (limited to 'NorthstarDLL/masterserver.cpp')
| -rw-r--r-- | NorthstarDLL/masterserver.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/NorthstarDLL/masterserver.cpp b/NorthstarDLL/masterserver.cpp index fc747e5d..2e1c5321 100644 --- a/NorthstarDLL/masterserver.cpp +++ b/NorthstarDLL/masterserver.cpp @@ -30,6 +30,7 @@ RemoteServerInfo::RemoteServerInfo( const char* newDescription, const char* newMap, const char* newPlaylist, + const char* newRegion, int newPlayerCount, int newMaxPlayers, bool newRequiresPassword) @@ -45,6 +46,9 @@ RemoteServerInfo::RemoteServerInfo( strncpy_s((char*)map, sizeof(map), newMap, sizeof(map) - 1); strncpy_s((char*)playlist, sizeof(playlist), newPlaylist, sizeof(playlist) - 1); + strncpy((char*)region, newRegion, sizeof(region)); + region[sizeof(region) - 1] = 0; + playerCount = newPlayerCount; maxPlayers = newMaxPlayers; } @@ -256,6 +260,7 @@ void MasterServerManager::RequestServerList() serverObj["description"].GetString(), serverObj["map"].GetString(), serverObj["playlist"].GetString(), + (serverObj.HasMember("region") && serverObj["region"].IsString()) ? serverObj["region"].GetString() : "", serverObj["playerCount"].GetInt(), serverObj["maxPlayers"].GetInt(), serverObj["hasPassword"].IsTrue()); @@ -273,6 +278,7 @@ void MasterServerManager::RequestServerList() serverObj["description"].GetString(), serverObj["map"].GetString(), serverObj["playlist"].GetString(), + (serverObj.HasMember("region") && serverObj["region"].IsString()) ? serverObj["region"].GetString() : "", serverObj["playerCount"].GetInt(), serverObj["maxPlayers"].GetInt(), serverObj["hasPassword"].IsTrue()); |