gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16574) -Codechange: reorder stuff in NetworkGameInfo so compilers waste less bytes aligning stuff and fix the comment of the structs.

Browse Source
This commit is contained in:
rubidium 2009-06-13 22:48:41 +00:00
parent f8bccce555
commit 4cd94e17a1
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/network/core/game.h
View File

@ -15,36 +15,38 @@
#include "../../date_type.h" #include "../../date_type.h"
/** /**
* This is the struct used by both client and server * The game information that is not generated on-the-fly and has to
* some fields will be empty on the client (like game_password) by default * be sent to the clients.
* and only filled with data a client enters.
*/ */
struct NetworkServerGameInfo { 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] 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 { 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 server_name[NETWORK_NAME_LENGTH]; ///< Server name
char hostname[NETWORK_HOSTNAME_LENGTH]; ///< Hostname of the server (if any) 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) 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 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 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? 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 clients_max; ///< Max clients allowed on server
byte companies_on; ///< How many started companies do we have byte companies_on; ///< How many started companies do we have
byte companies_max; ///< Max companies allowed on server byte companies_max; ///< Max companies allowed on server
byte spectators_on; ///< How many spectators do we have? byte spectators_on; ///< How many spectators do we have?
byte spectators_max; ///< Max spectators allowed on server 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 byte map_set; ///< Graphical set
bool dedicated; ///< Is this a dedicated server?
GRFConfig *grfconfig; ///< List of NewGRF files used
}; };
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */