File diff r25922:9fafc6f16577 → r25923:d1582e09c6ed
src/network/network_client.h
Show inline comments
 
@@ -19,13 +19,12 @@ private:
 
	struct PacketReader *savegame; ///< Packet reader for reading the savegame.
 
	byte token;                    ///< The token we need to send back to the server to prove we're the right client.
 

	
 
	/** Status of the connection with the server. */
 
	enum ServerStatus {
 
		STATUS_INACTIVE,      ///< The client is not connected nor active.
 
		STATUS_GAME_INFO,     ///< We are trying to get the game information.
 
		STATUS_JOIN,          ///< We are trying to join a server.
 
		STATUS_NEWGRFS_CHECK, ///< Last action was checking NewGRFs.
 
		STATUS_AUTH_GAME,     ///< Last action was requesting game (server) password.
 
		STATUS_AUTH_COMPANY,  ///< Last action was requesting company password.
 
		STATUS_AUTHORIZED,    ///< The client is authorized at the server.
 
		STATUS_MAP_WAIT,      ///< The client is waiting as someone else is downloading the map.
 
@@ -41,13 +40,12 @@ protected:
 
	friend void NetworkClose(bool close_admins);
 
	static ClientNetworkGameSocketHandler *my_client; ///< This is us!
 

	
 
	NetworkRecvStatus Receive_SERVER_FULL(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_BANNED(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_ERROR(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_GAME_INFO(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_CLIENT_INFO(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_NEED_GAME_PASSWORD(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_NEED_COMPANY_PASSWORD(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_WELCOME(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_WAIT(Packet *p) override;
 
	NetworkRecvStatus Receive_SERVER_MAP_BEGIN(Packet *p) override;
 
@@ -77,14 +75,12 @@ public:
 
	ClientNetworkGameSocketHandler(SOCKET s, const std::string &connection_string);
 
	~ClientNetworkGameSocketHandler();
 

	
 
	NetworkRecvStatus CloseConnection(NetworkRecvStatus status) override;
 
	void ClientError(NetworkRecvStatus res);
 

	
 
	static NetworkRecvStatus SendInformationQuery();
 

	
 
	static NetworkRecvStatus SendJoin();
 
	static NetworkRecvStatus SendCommand(const CommandPacket *cp);
 
	static NetworkRecvStatus SendError(NetworkErrorCode errorno);
 
	static NetworkRecvStatus SendQuit();
 
	static NetworkRecvStatus SendAck();