(svn r14721) -Codechange: s/NetworkTCPSocketHandler/NetworkClientSocket/ as it's (way) more descriptive what it's used for.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/network/network_internal.h b/src/network/network_internal.h
index 93bffd01b..f7098c1f6 100644
--- a/src/network/network_internal.h
+++ b/src/network/network_internal.h
@@ -125,7 +125,7 @@ extern CommandPacket *_local_command_queue;
 
 // Here we keep track of the clients
 //  (and the client uses [0] for his own communication)
-extern NetworkTCPSocketHandler _clients[MAX_CLIENTS];
+extern NetworkClientSocket _clients[MAX_CLIENTS];
 
 void NetworkTCPQueryServer(const char* host, unsigned short port);
 
@@ -136,15 +136,15 @@ void UpdateNetworkGameWindow(bool unselect);
 bool IsNetworkCompatibleVersion(const char *version);
 
 void NetworkExecuteCommand(CommandPacket *cp);
-void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp);
+void NetworkAddCommandQueue(NetworkClientSocket *cs, CommandPacket *cp);
 
 // from network.c
-void NetworkCloseClient(NetworkTCPSocketHandler *cs);
+void NetworkCloseClient(NetworkClientSocket *cs);
 void CDECL NetworkTextMessage(NetworkAction action, ConsoleColour color, bool self_send, const char *name, const char *str, ...);
-void NetworkGetClientName(char *clientname, size_t size, const NetworkTCPSocketHandler *cs);
-uint NetworkCalculateLag(const NetworkTCPSocketHandler *cs);
+void NetworkGetClientName(char *clientname, size_t size, const NetworkClientSocket *cs);
+uint NetworkCalculateLag(const NetworkClientSocket *cs);
 byte NetworkGetCurrentLanguageIndex();
-NetworkTCPSocketHandler *NetworkFindClientStateFromClientID(ClientID client_id);
+NetworkClientSocket *NetworkFindClientStateFromClientID(ClientID client_id);
 char* GetNetworkErrorMsg(char* buf, NetworkErrorCode err, const char* last);
 bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]);
 
@@ -154,8 +154,8 @@ bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]);
 #define DEF_CLIENT_RECEIVE_COMMAND(type) NetworkRecvStatus NetworkPacketReceive_ ## type ## _command(Packet *p)
 #define DEF_CLIENT_SEND_COMMAND(type) void NetworkPacketSend_ ## type ## _command()
 #define DEF_CLIENT_SEND_COMMAND_PARAM(type) void NetworkPacketSend_ ## type ## _command
-#define DEF_SERVER_RECEIVE_COMMAND(type) void NetworkPacketReceive_ ## type ## _command(NetworkTCPSocketHandler *cs, Packet *p)
-#define DEF_SERVER_SEND_COMMAND(type) void NetworkPacketSend_ ## type ## _command(NetworkTCPSocketHandler *cs)
+#define DEF_SERVER_RECEIVE_COMMAND(type) void NetworkPacketReceive_ ## type ## _command(NetworkClientSocket *cs, Packet *p)
+#define DEF_SERVER_SEND_COMMAND(type) void NetworkPacketSend_ ## type ## _command(NetworkClientSocket *cs)
 #define DEF_SERVER_SEND_COMMAND_PARAM(type) void NetworkPacketSend_ ## type ## _command
 
 #define SEND_COMMAND(type) NetworkPacketSend_ ## type ## _command