diff options
author | rubidium <rubidium@openttd.org> | 2010-10-15 19:58:56 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2010-10-15 19:58:56 +0000 |
commit | 9858d699a3c39be2e3a547d59163178012365598 (patch) | |
tree | b0d10b23b4d41471d8ba846ca1805614acfec187 /src/network/core/tcp_game.h | |
parent | bda26d03b509c3783596c0b3431ca0c8fd7c9990 (diff) | |
download | openttd-9858d699a3c39be2e3a547d59163178012365598.tar.xz |
(svn r20935) -Codechange: only let the server side use a pool of connected sockets
Diffstat (limited to 'src/network/core/tcp_game.h')
-rw-r--r-- | src/network/core/tcp_game.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index 5ab814bae..71537179b 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -108,16 +108,11 @@ enum ClientStatus { STATUS_END ///< Must ALWAYS be on the end of this list!! (period) }; -class NetworkGameSocketHandler; -typedef NetworkGameSocketHandler NetworkClientSocket; -typedef Pool<NetworkClientSocket, ClientIndex, 8, MAX_CLIENT_SLOTS> NetworkClientSocketPool; -extern NetworkClientSocketPool _networkclientsocket_pool; - #define DECLARE_GAME_RECEIVE_COMMAND(type) virtual NetworkRecvStatus NetworkPacketReceive_## type ##_command(Packet *p) #define DEF_GAME_RECEIVE_COMMAND(cls, type) NetworkRecvStatus cls ##NetworkGameSocketHandler::NetworkPacketReceive_ ## type ## _command(Packet *p) /** Base socket handler for all TCP sockets */ -class NetworkGameSocketHandler : public NetworkClientSocketPool::PoolItem<&_networkclientsocket_pool>, public NetworkTCPSocketHandler { +class NetworkGameSocketHandler : public NetworkTCPSocketHandler { /* TODO: rewrite into a proper class */ private: NetworkClientInfo *info; ///< Client info related to this socket @@ -191,9 +186,6 @@ public: void Send_Command(Packet *p, const CommandPacket *cp); }; -#define FOR_ALL_CLIENT_SOCKETS_FROM(var, start) FOR_ALL_ITEMS_FROM(NetworkClientSocket, clientsocket_index, var, start) -#define FOR_ALL_CLIENT_SOCKETS(var) FOR_ALL_CLIENT_SOCKETS_FROM(var, 0) - #endif /* ENABLE_NETWORK */ #endif /* NETWORK_CORE_TCP_GAME_H */ |