From 8eb07d097e2ab53f0b41a6b7af541c4937732e0b Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 15 Oct 2010 13:22:00 +0000 Subject: (svn r20923) -Codechange: prepare creating sub-classes of NetworkClientSocket for server and client side --- src/network/core/tcp_game.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/network/core/tcp_game.h') diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index acbd47ed8..77da6218c 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -108,15 +108,18 @@ enum ClientStatus { STATUS_END ///< Must ALWAYS be on the end of this list!! (period) }; -class NetworkClientSocket; +class NetworkGameSocketHandler; +typedef NetworkGameSocketHandler NetworkClientSocket; typedef Pool NetworkClientSocketPool; extern NetworkClientSocketPool _networkclientsocket_pool; /** Base socket handler for all TCP sockets */ -class NetworkClientSocket : public NetworkClientSocketPool::PoolItem<&_networkclientsocket_pool>, public NetworkTCPSocketHandler { +class NetworkGameSocketHandler : public NetworkClientSocketPool::PoolItem<&_networkclientsocket_pool>, public NetworkTCPSocketHandler { /* TODO: rewrite into a proper class */ private: NetworkClientInfo *info; ///< Client info related to this socket +protected: + NetworkGameSocketHandler(SOCKET s); public: ClientID client_id; ///< Client identifier uint32 last_frame; ///< Last frame we have executed @@ -129,9 +132,7 @@ public: CommandQueue outgoing_queue; ///< The command-queue awaiting delivery NetworkRecvStatus CloseConnection(bool error = true); - - NetworkClientSocket(ClientID client_id = INVALID_CLIENT_ID); - ~NetworkClientSocket(); + virtual ~NetworkGameSocketHandler() {} inline void SetInfo(NetworkClientInfo *info) { assert(info != NULL && this->info == NULL); this->info = info; } inline NetworkClientInfo *GetInfo() const { return this->info; } -- cgit v1.2.3-54-g00ecf