From abf2b0efc36e09caac75ad777af6842a16b66d22 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 3 Jun 2008 08:04:35 +0000 Subject: (svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo. -Fix: failure of changing the server password during games because the password wasn't duplicated properly. --- src/network/core/game.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/network/core/game.h') diff --git a/src/network/core/game.h b/src/network/core/game.h index 0c0123697..6b8e989b3 100644 --- a/src/network/core/game.h +++ b/src/network/core/game.h @@ -19,7 +19,13 @@ * some fields will be empty on the client (like game_password) by default * and only filled with data a player enters. */ -struct NetworkGameInfo { +struct NetworkServerGameInfo { + byte clients_on; ///< Current count of clients on server + Date start_date; ///< When the game started + char map_name[NETWORK_NAME_LENGTH]; ///< Map which is played ["random" for a randomized map] +}; + +struct NetworkGameInfo : NetworkServerGameInfo { byte game_info_version; ///< Version of the game info char server_name[NETWORK_NAME_LENGTH]; ///< Server name char hostname[NETWORK_HOSTNAME_LENGTH]; ///< Hostname of the server (if any) @@ -28,21 +34,16 @@ struct NetworkGameInfo { bool compatible; ///< Can we connect to this server or not? (based on server_revision _and_ grf_match byte server_lang; ///< Language of the server (we should make a nice table for this) bool use_password; ///< Is this server passworded? - char server_password[NETWORK_PASSWORD_LENGTH]; ///< On the server: the game password, on the client: != "" if server has password byte clients_max; ///< Max clients allowed on server - byte clients_on; ///< Current count of clients on server - byte companies_max; ///< Max companies allowed on server byte companies_on; ///< How many started companies do we have - byte spectators_max; ///< Max spectators allowed on server + 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 Date game_date; ///< Current date - Date start_date; ///< When the game started - char map_name[NETWORK_NAME_LENGTH]; ///< Map which is played ["random" for a randomized map] uint16 map_width; ///< Map width uint16 map_height; ///< Map height byte map_set; ///< Graphical set bool dedicated; ///< Is this a dedicated server? - char rcon_password[NETWORK_PASSWORD_LENGTH]; ///< RCon password for the server. "" if rcon is disabled GRFConfig *grfconfig; ///< List of NewGRF files used }; -- cgit v1.2.3-70-g09d2