diff options
Diffstat (limited to 'src/network/network_base.h')
| -rw-r--r-- | src/network/network_base.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/network/network_base.h b/src/network/network_base.h index 700541b49..2714217cd 100644 --- a/src/network/network_base.h +++ b/src/network/network_base.h @@ -8,11 +8,12 @@ #ifdef ENABLE_NETWORK #include "network_type.h" -#include "../oldpool.h" +#include "../core/pool.hpp" -DECLARE_OLD_POOL(NetworkClientInfo, NetworkClientInfo, NCI_BITS_PER_POOL_BLOCK, MAX_CLIENT_SLOTS >> NCI_BITS_PER_POOL_BLOCK); +typedef Pool<NetworkClientInfo, ClientIndex, 8, MAX_CLIENT_SLOTS> NetworkClientInfoPool; +extern NetworkClientInfoPool _networkclientinfo_pool; -struct NetworkClientInfo : PoolItem<NetworkClientInfo, ClientIndex, &_NetworkClientInfo_pool> { +struct NetworkClientInfo : NetworkClientInfoPool::PoolItem<&_networkclientinfo_pool> { ClientID client_id; ///< Client identifier (same as ClientState->client_id) char client_name[NETWORK_CLIENT_NAME_LENGTH]; ///< Name of the client byte client_lang; ///< The language of the client @@ -23,8 +24,6 @@ struct NetworkClientInfo : PoolItem<NetworkClientInfo, ClientIndex, &_NetworkCli NetworkClientInfo(ClientID client_id = INVALID_CLIENT_ID) : client_id(client_id) {} ~NetworkClientInfo() { client_id = INVALID_CLIENT_ID; } - - inline bool IsValid() const { return client_id != INVALID_CLIENT_ID; } }; #define FOR_ALL_CLIENT_INFOS_FROM(var, start) FOR_ALL_ITEMS_FROM(NetworkClientInfo, clientinfo_index, var, start) |