diff options
Diffstat (limited to 'src/network/core')
| -rw-r--r-- | src/network/core/game_info.cpp | 10 | ||||
| -rw-r--r-- | src/network/core/game_info.h | 32 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/network/core/game_info.cpp b/src/network/core/game_info.cpp index 47e6f221e..f7044a3fc 100644 --- a/src/network/core/game_info.cpp +++ b/src/network/core/game_info.cpp @@ -112,7 +112,7 @@ bool IsNetworkCompatibleVersion(const char *other) void CheckGameCompatibility(NetworkGameInfo &ngi) { /* Check if we are allowed on this server based on the revision-check. */ - ngi.version_compatible = IsNetworkCompatibleVersion(ngi.server_revision); + ngi.version_compatible = IsNetworkCompatibleVersion(ngi.server_revision.c_str()); ngi.compatible = ngi.version_compatible; /* Check if we have all the GRFs on the client-system too. */ @@ -138,8 +138,8 @@ void FillStaticNetworkServerGameInfo() _network_game_info.dedicated = _network_dedicated; _network_game_info.grfconfig = _grfconfig; - strecpy(_network_game_info.server_name, _settings_client.network.server_name, lastof(_network_game_info.server_name)); - strecpy(_network_game_info.server_revision, GetNetworkRevisionString(), lastof(_network_game_info.server_revision)); + _network_game_info.server_name = _settings_client.network.server_name; + _network_game_info.server_revision = GetNetworkRevisionString(); } /** @@ -295,8 +295,8 @@ void DeserializeNetworkGameInfo(Packet *p, NetworkGameInfo *info) FALLTHROUGH; case 1: - p->Recv_string(info->server_name, sizeof(info->server_name)); - p->Recv_string(info->server_revision, sizeof(info->server_revision)); + info->server_name = p->Recv_string(NETWORK_NAME_LENGTH); + info->server_revision = p->Recv_string(NETWORK_REVISION_LENGTH); p->Recv_uint8 (); // Used to contain server-lang. info->use_password = p->Recv_bool (); info->clients_max = p->Recv_uint8 (); diff --git a/src/network/core/game_info.h b/src/network/core/game_info.h index ef83e4d05..668b9801d 100644 --- a/src/network/core/game_info.h +++ b/src/network/core/game_info.h @@ -60,22 +60,22 @@ * The game information that is sent from the server to the client. */ struct NetworkServerGameInfo { - GRFConfig *grfconfig; ///< List of NewGRF files used - Date start_date; ///< When the game started - Date game_date; ///< Current date - uint16 map_width; ///< Map width - uint16 map_height; ///< Map height - char server_name[NETWORK_NAME_LENGTH]; ///< Server name - char server_revision[NETWORK_REVISION_LENGTH]; ///< The version number the server is using (e.g.: 'r304' or 0.5.0) - bool dedicated; ///< Is this a dedicated server? - bool use_password; ///< Is this server passworded? - byte clients_on; ///< Current count of clients on server - byte clients_max; ///< Max clients allowed on server - byte companies_on; ///< How many started companies do we have - byte companies_max; ///< Max companies allowed on server - byte spectators_on; ///< How many spectators do we have? - byte spectators_max; ///< Max spectators allowed on server - byte landscape; ///< The used landscape + GRFConfig *grfconfig; ///< List of NewGRF files used + Date start_date; ///< When the game started + Date game_date; ///< Current date + uint16 map_width; ///< Map width + uint16 map_height; ///< Map height + std::string server_name; ///< Server name + std::string server_revision; ///< The version number the server is using (e.g.: 'r304' or 0.5.0) + bool dedicated; ///< Is this a dedicated server? + bool use_password; ///< Is this server passworded? + byte clients_on; ///< Current count of clients on server + byte clients_max; ///< Max clients allowed on server + byte companies_on; ///< How many started companies do we have + byte companies_max; ///< Max companies allowed on server + byte spectators_on; ///< How many spectators do we have? + byte spectators_max; ///< Max spectators allowed on server + byte landscape; ///< The used landscape }; /** |