From 515edee17c6cb6e2f860bcdb3308a0fc5e538e86 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 15 Oct 2010 14:29:13 +0000 Subject: (svn r20925) -Codechange: make the client send commands have a slightly more sensible name --- src/network/network_client.h | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'src/network/network_client.h') diff --git a/src/network/network_client.h b/src/network/network_client.h index ee0c56fca..4e9934cce 100644 --- a/src/network/network_client.h +++ b/src/network/network_client.h @@ -19,6 +19,8 @@ /** Class for handling the client side of the game connection. */ class ClientNetworkGameSocketHandler : public NetworkGameSocketHandler { protected: + static ClientNetworkGameSocketHandler *my_client; + DECLARE_GAME_RECEIVE_COMMAND(PACKET_SERVER_FULL); DECLARE_GAME_RECEIVE_COMMAND(PACKET_SERVER_BANNED); DECLARE_GAME_RECEIVE_COMMAND(PACKET_SERVER_ERROR); @@ -43,23 +45,33 @@ protected: DECLARE_GAME_RECEIVE_COMMAND(PACKET_SERVER_MOVE); DECLARE_GAME_RECEIVE_COMMAND(PACKET_SERVER_COMPANY_UPDATE); DECLARE_GAME_RECEIVE_COMMAND(PACKET_SERVER_CONFIG_UPDATE); + + static NetworkRecvStatus SendNewGRFsOk(); + static NetworkRecvStatus SendGetMap(); + static NetworkRecvStatus SendMapOk(); public: ClientNetworkGameSocketHandler(SOCKET s); + ~ClientNetworkGameSocketHandler(); + + static NetworkRecvStatus SendCompanyInformationQuery(); + + static NetworkRecvStatus SendJoin(); + static NetworkRecvStatus SendCommand(const CommandPacket *cp); + static NetworkRecvStatus SendError(NetworkErrorCode errorno); + static NetworkRecvStatus SendQuit(); + static NetworkRecvStatus SendAck(); + + static NetworkRecvStatus SendGamePassword(const char *password); + static NetworkRecvStatus SendCompanyPassword(const char *password); + + static NetworkRecvStatus SendChat(NetworkAction action, DestType type, int dest, const char *msg, int64 data); + static NetworkRecvStatus SendSetPassword(const char *password); + static NetworkRecvStatus SendSetName(const char *name); + static NetworkRecvStatus SendRCon(const char *password, const char *command); + static NetworkRecvStatus SendMove(CompanyID company, const char *password); }; -DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_GAME_INFO); -DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_COMPANY_INFO); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_COMMAND)(const CommandPacket *cp); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_ERROR)(NetworkErrorCode errorno); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_QUIT)(); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_CHAT)(NetworkAction action, DestType desttype, int dest, const char *msg, int64 data); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_GAME_PASSWORD)(const char *password); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_COMPANY_PASSWORD)(const char *password); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_SET_PASSWORD)(const char *password); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_SET_NAME)(const char *name); -DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_ACK); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_RCON)(const char *pass, const char *command); -DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_MOVE)(CompanyID company, const char *pass); +typedef ClientNetworkGameSocketHandler MyClient; void NetworkClient_Connected(); -- cgit v1.2.3-54-g00ecf