diff options
| author | smatz <smatz@openttd.org> | 2009-05-16 23:44:36 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-16 23:44:36 +0000 |
| commit | ed1e54bd84074412ea9f273b7cd86aed42d844ce (patch) | |
| tree | 4a5ab5dbd304f9a53f8f0065bc6965b1680ded78 /src/network | |
| parent | 6221d74644922ea4bbba3ed9cd8bbec42398f77b (diff) | |
| download | openttd-ed1e54bd84074412ea9f273b7cd86aed42d844ce.tar.xz | |
(svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize()
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/core/tcp_game.h | 4 | ||||
| -rw-r--r-- | src/network/network_base.h | 4 | ||||
| -rw-r--r-- | src/network/network_chat_gui.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index e1224c5e2..48abc996d 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -110,10 +110,10 @@ public: static inline bool IsValidNetworkClientSocketIndex(ClientIndex index) { - return (uint)index < GetNetworkClientSocketPoolSize() && NetworkClientSocket::Get(index)->IsValid(); + return (uint)index < NetworkClientSocket::GetPoolSize() && NetworkClientSocket::Get(index)->IsValid(); } -#define FOR_ALL_CLIENT_SOCKETS_FROM(d, start) for (d = NetworkClientSocket::Get(start); d != NULL; d = (d->index + 1U < GetNetworkClientSocketPoolSize()) ? NetworkClientSocket::Get(d->index + 1U) : NULL) if (d->IsValid()) +#define FOR_ALL_CLIENT_SOCKETS_FROM(d, start) for (d = NetworkClientSocket::Get(start); d != NULL; d = (d->index + 1U < NetworkClientSocket::GetPoolSize()) ? NetworkClientSocket::Get(d->index + 1U) : NULL) if (d->IsValid()) #define FOR_ALL_CLIENT_SOCKETS(d) FOR_ALL_CLIENT_SOCKETS_FROM(d, 0) #endif /* ENABLE_NETWORK */ diff --git a/src/network/network_base.h b/src/network/network_base.h index 3892db7d3..3044de7a1 100644 --- a/src/network/network_base.h +++ b/src/network/network_base.h @@ -29,10 +29,10 @@ struct NetworkClientInfo : PoolItem<NetworkClientInfo, ClientIndex, &_NetworkCli static inline bool IsValidNetworkClientInfoIndex(ClientIndex index) { - return (uint)index < GetNetworkClientInfoPoolSize() && NetworkClientInfo::Get(index)->IsValid(); + return (uint)index < NetworkClientInfo::GetPoolSize() && NetworkClientInfo::Get(index)->IsValid(); } -#define FOR_ALL_CLIENT_INFOS_FROM(d, start) for (d = NetworkClientInfo::Get(start); d != NULL; d = (d->index + 1U < GetNetworkClientInfoPoolSize()) ? NetworkClientInfo::Get(d->index + 1U) : NULL) if (d->IsValid()) +#define FOR_ALL_CLIENT_INFOS_FROM(d, start) for (d = NetworkClientInfo::Get(start); d != NULL; d = (d->index + 1U < NetworkClientInfo::GetPoolSize()) ? NetworkClientInfo::Get(d->index + 1U) : NULL) if (d->IsValid()) #define FOR_ALL_CLIENT_INFOS(d) FOR_ALL_CLIENT_INFOS_FROM(d, 0) #endif /* ENABLE_NETWORK */ diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index c0559af65..17e17e32c 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -303,7 +303,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow { /* First, try clients */ if (*item < MAX_CLIENT_SLOTS) { - if (*item < GetNetworkClientInfoPoolSize()) { + if (*item < NetworkClientInfo::GetPoolSize()) { /* Skip inactive clients */ NetworkClientInfo *ci; FOR_ALL_CLIENT_INFOS_FROM(ci, *item) break; |