Mercurial > hg > openttd
changeset 17599:0b227bfee542 draft
(svn r22363) -Codechange: NetworkFindClientStateFromClientID -> NetworkClientSocket::GetByClientID
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Fri, 22 Apr 2011 15:54:42 +0000 |
| parents | 0a51450014d0 |
| children | e3a9122e11c6 |
| files | src/network/network.cpp src/network/network_internal.h src/network/network_server.cpp src/network/network_server.h |
| diffstat | 4 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -124,7 +124,7 @@ * @param client_id the ClientID to search for * @return return a pointer to the corresponding NetworkClientSocket struct or NULL when not found */ -NetworkClientSocket *NetworkFindClientStateFromClientID(ClientID client_id) +/* static */ NetworkClientSocket *NetworkClientSocket::GetByClientID(ClientID client_id) { NetworkClientSocket *cs;
--- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -164,7 +164,6 @@ void NetworkError(StringID error_string); void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const char *name, const char *str = "", int64 data = 0); uint NetworkCalculateLag(const NetworkClientSocket *cs); -NetworkClientSocket *NetworkFindClientStateFromClientID(ClientID client_id); StringID GetNetworkErrorMsg(NetworkErrorCode err); bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]); const char *GenerateCompanyPasswordHash(const char *password, const char *password_server_id, uint32 password_game_seed);
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1890,7 +1890,7 @@ if (client_id == CLIENT_ID_SERVER) { SetLocalCompany(company_id); } else { - NetworkClientSocket *cs = NetworkFindClientStateFromClientID(client_id); + NetworkClientSocket *cs = NetworkClientSocket::GetByClientID(client_id); /* When the company isn't authorized we can't move them yet. */ if (cs->status < NetworkClientSocket::STATUS_AUTHORIZED) return; cs->SendMove(client_id, company_id); @@ -1905,12 +1905,12 @@ void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, const char *string) { - NetworkFindClientStateFromClientID(client_id)->SendRConResult(colour_code, string); + NetworkClientSocket::GetByClientID(client_id)->SendRConResult(colour_code, string); } static void NetworkServerSendError(ClientID client_id, NetworkErrorCode error) { - NetworkFindClientStateFromClientID(client_id)->SendError(error); + NetworkClientSocket::GetByClientID(client_id)->SendError(error); } void NetworkServerKickClient(ClientID client_id)