diff options
| author | rubidium <rubidium@openttd.org> | 2009-06-13 22:48:41 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-06-13 22:48:41 +0000 |
| commit | 4cd94e17a179760274cf392a6585d7ec35983316 (patch) | |
| tree | 8a644ddafc6f94fa542dac816027815958ac360b | |
| parent | f8bccce555bccadafe0035a5d9820c2b33dc8174 (diff) | |
| download | openttd-4cd94e17a179760274cf392a6585d7ec35983316.tar.xz | |
(svn r16574) -Codechange: reorder stuff in NetworkGameInfo so compilers waste less bytes aligning stuff and fix the comment of the structs.
| -rw-r--r-- | src/network/core/game.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/network/core/game.h b/src/network/core/game.h index 714711fe4..462914176 100644 --- a/src/network/core/game.h +++ b/src/network/core/game.h @@ -15,36 +15,38 @@ #include "../../date_type.h" /** - * This is the struct used by both client and server - * some fields will be empty on the client (like game_password) by default - * and only filled with data a client enters. + * The game information that is not generated on-the-fly and has to + * be sent to the clients. */ 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] + byte clients_on; ///< Current count of clients on server }; +/** + * The game information that is sent from the server to the clients. + */ struct NetworkGameInfo : NetworkServerGameInfo { - byte game_info_version; ///< Version of the game info + 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 hostname[NETWORK_HOSTNAME_LENGTH]; ///< Hostname of the server (if any) 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 version_compatible; ///< Can we connect to this server or not? (based on server_revision) 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? + byte game_info_version; ///< Version of the game info + byte server_lang; ///< Language of the server (we should make a nice table for this) 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 - Date game_date; ///< Current date - uint16 map_width; ///< Map width - uint16 map_height; ///< Map height byte map_set; ///< Graphical set - bool dedicated; ///< Is this a dedicated server? - GRFConfig *grfconfig; ///< List of NewGRF files used }; #endif /* ENABLE_NETWORK */ |