From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/core/netclient.h | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'src/core/netclient.h') diff --git a/src/core/netclient.h b/src/core/netclient.h index c0cdf8d..818422e 100644 --- a/src/core/netclient.h +++ b/src/core/netclient.h @@ -43,14 +43,14 @@ namespace core class NetClient { public: - NetClient(std::string host, int port, int fd); - ~NetClient(); + NetClient(std::string host, int port, int fd); + ~NetClient(); - /// the remote hostname the client is connected to - std::string host() const; + /// the remote hostname the client is connected to + std::string host() const; - /// the remote port the client is connected to - int port() const; + /// the remote port the client is connected to + int port() const; /// the player info associated with this client Player *player(); @@ -69,32 +69,38 @@ public: /// transmit messages in the send queue to the remote client void transmit(); - - inline bool error() const { return client_error; } + + inline bool error() const { + return client_error; + } void abort(); - enum State {Connecting=0, Pending=1, Connected=2}; + enum State {Connecting = 0, Pending = 1, Connected = 2}; + + inline State state() const { + return client_state; + } - inline State state() const { return client_state; } - State client_state; - + float client_timeout; float client_keepalive; private: - inline int fd() const { return client_fd; } + inline int fd() const { + return client_fd; + } struct sockaddr_in client_addr; - std::string client_host; - int client_port; + std::string client_host; + int client_port; int client_fd; bool client_error; NetPlayer *client_player; - - std::string messageblock; + + std::string messageblock; std::deque recvq; std::string sendq; }; -- cgit v1.2.3