diff options
| author | smatz <smatz@openttd.org> | 2009-05-22 15:13:50 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-22 15:13:50 +0000 |
| commit | 62a7948af0ca9eb3b190a54918201e1075edcbbc (patch) | |
| tree | 27a79b7850682cd43cac2462c3410ed8b567c4b2 /src/network/network.cpp | |
| parent | 04723b240ebc7384954f73590be517ad2a47ce04 (diff) | |
| download | openttd-62a7948af0ca9eb3b190a54918201e1075edcbbc.tar.xz | |
(svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved
Diffstat (limited to 'src/network/network.cpp')
| -rw-r--r-- | src/network/network.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp index 4d407e2b0..266ce506d 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -32,16 +32,18 @@ #include "../landscape_type.h" #include "../rev.h" #include "../core/alloc_func.hpp" +#include "../core/pool_func.hpp" #ifdef DEBUG_DUMP_COMMANDS #include "../fileio_func.h" #endif /* DEBUG_DUMP_COMMANDS */ #include "table/strings.h" -#include "../oldpool_func.h" DECLARE_POSTFIX_INCREMENT(ClientID); -typedef ClientIndex NetworkClientInfoID; -DEFINE_OLD_POOL_GENERIC(NetworkClientInfo, NetworkClientInfo); +assert_compile(NetworkClientInfoPool::MAX_SIZE == NetworkClientSocketPool::MAX_SIZE); + +NetworkClientInfoPool _networkclientinfo_pool("NetworkClientInfo"); +INSTANTIATE_POOL_METHODS(NetworkClientInfo) bool _networking; ///< are we in networking mode? bool _network_server; ///< network-server is active @@ -557,10 +559,8 @@ static bool NetworkListen() /** Resets both pools used for network clients */ static void InitializeNetworkPools() { - _NetworkClientSocket_pool.CleanPool(); - _NetworkClientSocket_pool.AddBlockToPool(); - _NetworkClientInfo_pool.CleanPool(); - _NetworkClientInfo_pool.AddBlockToPool(); + _networkclientsocket_pool.CleanPool(); + _networkclientinfo_pool.CleanPool(); } /* Close all current connections */ |