diff options
author | rubidium <rubidium@openttd.org> | 2011-12-19 17:48:04 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-12-19 17:48:04 +0000 |
commit | df16ebd7301a989c813c26ab2e21163d361ee236 (patch) | |
tree | c74b8a1f965a17c3ac054290ae8d918d88ad1e52 /src/network | |
parent | eaadd215be7a4594bd37504935a821f8cf68c984 (diff) | |
download | openttd-df16ebd7301a989c813c26ab2e21163d361ee236.tar.xz |
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/core/tcp_admin.h | 6 | ||||
-rw-r--r-- | src/network/core/tcp_content.h | 6 | ||||
-rw-r--r-- | src/network/core/tcp_game.h | 2 | ||||
-rw-r--r-- | src/network/core/udp.h | 4 | ||||
-rw-r--r-- | src/network/network_client.h | 2 | ||||
-rw-r--r-- | src/network/network_server.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/network/core/tcp_admin.h b/src/network/core/tcp_admin.h index 46b876952..df6e55397 100644 --- a/src/network/core/tcp_admin.h +++ b/src/network/core/tcp_admin.h @@ -66,7 +66,7 @@ enum PacketAdminType { enum AdminStatus { ADMIN_STATUS_INACTIVE, ///< The admin is not connected nor active. ADMIN_STATUS_ACTIVE, ///< The admin is active. - ADMIN_STATUS_END ///< Must ALWAYS be on the end of this list!! (period) + ADMIN_STATUS_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Update types an admin can register a frequency for */ @@ -80,7 +80,7 @@ enum AdminUpdateType { ADMIN_UPDATE_CONSOLE, ///< The admin would like to have console messages. ADMIN_UPDATE_CMD_NAMES, ///< The admin would like a list of all DoCommand names. ADMIN_UPDATE_CMD_LOGGING, ///< The admin would like to have DoCommand information. - ADMIN_UPDATE_END ///< Must ALWAYS be on the end of this list!! (period) + ADMIN_UPDATE_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Update frequencies an admin can register. */ @@ -101,7 +101,7 @@ enum AdminCompanyRemoveReason { ADMIN_CRR_AUTOCLEAN, ///< The company is removed due to autoclean. ADMIN_CRR_BANKRUPT, ///< The company went belly-up. - ADMIN_CRR_END ///< Sentinel for end. + ADMIN_CRR_END, ///< Sentinel for end. }; /** Main socket handler for admin related connections. */ diff --git a/src/network/core/tcp_content.h b/src/network/core/tcp_content.h index 396202f23..263ce6ba6 100644 --- a/src/network/core/tcp_content.h +++ b/src/network/core/tcp_content.h @@ -44,12 +44,12 @@ enum PacketContentType { PACKET_CONTENT_SERVER_INFO, ///< Reply of content server with information about content PACKET_CONTENT_CLIENT_CONTENT, ///< Request a content file given an internal ID PACKET_CONTENT_SERVER_CONTENT, ///< Reply with the content of the given ID - PACKET_CONTENT_END ///< Must ALWAYS be on the end of this list!! (period) + PACKET_CONTENT_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Unique identifier for the content. */ enum ContentID { - INVALID_CONTENT_ID = UINT32_MAX ///< Sentinel for invalid content. + INVALID_CONTENT_ID = UINT32_MAX, ///< Sentinel for invalid content. }; /** Container for all important information about a piece of content. */ @@ -61,7 +61,7 @@ struct ContentInfo { AUTOSELECTED, ///< The content has been selected as dependency ALREADY_HERE, ///< The content is already at the client side DOES_NOT_EXIST, ///< The content does not exist in the content system - INVALID ///< The content's invalid + INVALID, ///< The content's invalid }; ContentType type; ///< Type of content diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index 53d6df892..31a059f69 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -123,7 +123,7 @@ enum PacketGameType { PACKET_CLIENT_ERROR, ///< A client reports an error to the server. PACKET_SERVER_ERROR_QUIT, ///< A server tells that a client has hit an error and did quit. - PACKET_END ///< Must ALWAYS be on the end of this list!! (period) + PACKET_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Packet that wraps a command */ diff --git a/src/network/core/udp.h b/src/network/core/udp.h index ff645bca3..29abb8a68 100644 --- a/src/network/core/udp.h +++ b/src/network/core/udp.h @@ -34,7 +34,7 @@ enum PacketUDPType { PACKET_UDP_CLIENT_GET_NEWGRFS, ///< Requests the name for a list of GRFs (GRF_ID and MD5) PACKET_UDP_SERVER_NEWGRFS, ///< Sends the list of NewGRF's requested. PACKET_UDP_MASTER_SESSION_KEY, ///< Sends a fresh session key to the client - PACKET_UDP_END ///< Must ALWAYS be on the end of this list!! (period) + PACKET_UDP_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** The types of server lists we can get */ @@ -43,7 +43,7 @@ enum ServerListType { SLT_IPv6 = 1, ///< Get the IPv6 addresses SLT_AUTODETECT, ///< Autodetect the type based on the connection - SLT_END = SLT_AUTODETECT ///< End of 'arrays' marker + SLT_END = SLT_AUTODETECT, ///< End of 'arrays' marker }; /** Base socket handler for all UDP sockets */ diff --git a/src/network/network_client.h b/src/network/network_client.h index 238afaf90..342834f1c 100644 --- a/src/network/network_client.h +++ b/src/network/network_client.h @@ -34,7 +34,7 @@ private: STATUS_MAP_WAIT, ///< The client is waiting as someone else is downloading the map. STATUS_MAP, ///< The client is downloading the map. STATUS_ACTIVE, ///< The client is active within in the game. - STATUS_END ///< Must ALWAYS be on the end of this list!! (period) + STATUS_END, ///< Must ALWAYS be on the end of this list!! (period) }; ServerStatus status; ///< Status of the connection with the server. diff --git a/src/network/network_server.h b/src/network/network_server.h index ad1b381a9..e9d790a48 100644 --- a/src/network/network_server.h +++ b/src/network/network_server.h @@ -65,7 +65,7 @@ public: STATUS_DONE_MAP, ///< The client has downloaded the map. STATUS_PRE_ACTIVE, ///< The client is catching up the delayed frames. STATUS_ACTIVE, ///< The client is active within in the game. - STATUS_END ///< Must ALWAYS be on the end of this list!! (period). + STATUS_END, ///< Must ALWAYS be on the end of this list!! (period). }; byte lag_test; ///< Byte used for lag-testing the client |