(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/network/core/config.h b/src/network/core/config.h
index 7d9672036..c41190cce 100644
--- a/src/network/core/config.h
+++ b/src/network/core/config.h
@@ -29,8 +29,8 @@ enum {
 	NETWORK_UNIQUE_ID_LENGTH      =   33, ///< The maximum length of the unique id of the clients, in bytes including '\0'
 	NETWORK_REVISION_LENGTH       =   15, ///< The maximum length of the revision, in bytes including '\0'
 	NETWORK_PASSWORD_LENGTH       =   33, ///< The maximum length of the password, in bytes including '\0' (must be >= NETWORK_UNIQUE_ID_LENGTH)
-	NETWORK_PLAYERS_LENGTH        =  200, ///< The maximum length for the list of players that controls a company, in bytes including '\0'
-	NETWORK_CLIENT_NAME_LENGTH    =   25, ///< The maximum length of a player, in bytes including '\0'
+	NETWORK_CLIENTS_LENGTH        =  200, ///< The maximum length for the list of clients that controls a company, in bytes including '\0'
+	NETWORK_CLIENT_NAME_LENGTH    =   25, ///< The maximum length of a client's name, in bytes including '\0'
 	NETWORK_RCONCOMMAND_LENGTH    =  500, ///< The maximum length of a rconsole command, in bytes including '\0'
 	NETWORK_CHAT_LENGTH           =  900, ///< The maximum length of a chat message, in bytes including '\0'
 
diff --git a/src/network/core/game.h b/src/network/core/game.h
index 6b8e989b3..714711fe4 100644
--- a/src/network/core/game.h
+++ b/src/network/core/game.h
@@ -17,7 +17,7 @@
 /**
  * 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 player enters.
+ * and only filled with data a client enters.
  */
 struct NetworkServerGameInfo {
 	byte clients_on;                                ///< Current count of clients on server
diff --git a/src/network/core/tcp.h b/src/network/core/tcp.h
index 16a795e28..6af0d17f8 100644
--- a/src/network/core/tcp.h
+++ b/src/network/core/tcp.h
@@ -61,7 +61,7 @@ enum {
 /** Packet that wraps a command */
 struct CommandPacket {
 	CommandPacket *next; ///< the next command packet (if in queue)
-	PlayerByte player; ///< player that is executing the command
+	CompanyByte company; ///< company that is executing the command
 	uint32 cmd;        ///< command being executed
 	uint32 p1;         ///< parameter p1
 	uint32 p2;         ///< parameter p2
@@ -81,7 +81,7 @@ enum ClientStatus {
 	STATUS_MAP,        ///< The client is downloading the map
 	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 an active player in the game
+	STATUS_ACTIVE,     ///< The client is active within in the game
 };
 
 /** Base socket handler for all TCP sockets */