summaryrefslogtreecommitdiff
path: root/src/network/network.cpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2010-04-11 17:32:14 +0000
committersmatz <smatz@openttd.org>2010-04-11 17:32:14 +0000
commit7f3844d3aa44423b9fd92afc67a530ac13284901 (patch)
treef1d075c4dce429faaa855e48e09fd64b815bdc72 /src/network/network.cpp
parent43015ad79b0a2de4ca378710d34740ad508aa5c1 (diff)
downloadopenttd-7f3844d3aa44423b9fd92afc67a530ac13284901.tar.xz
(svn r19610) -Codechange: rename STATUS_AUTH to STATUS_AUTHORIZED
Diffstat (limited to 'src/network/network.cpp')
-rw-r--r--src/network/network.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 24fc8a856..68eeeb509 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -452,7 +452,7 @@ static bool NetworkHasJoiningClient()
{
const NetworkClientSocket *cs;
FOR_ALL_CLIENT_SOCKETS(cs) {
- if (cs->status >= STATUS_AUTH && cs->status < STATUS_ACTIVE) return true;
+ if (cs->status >= STATUS_AUTHORIZED && cs->status < STATUS_ACTIVE) return true;
}
return false;
@@ -548,7 +548,7 @@ NetworkRecvStatus NetworkCloseClient(NetworkClientSocket *cs, NetworkRecvStatus
*/
if (cs->sock == INVALID_SOCKET) return status;
- if (status != NETWORK_RECV_STATUS_CONN_LOST && !cs->HasClientQuit() && _network_server && cs->status >= STATUS_AUTH) {
+ if (status != NETWORK_RECV_STATUS_CONN_LOST && !cs->HasClientQuit() && _network_server && cs->status >= STATUS_AUTHORIZED) {
/* We did not receive a leave message from this client... */
char client_name[NETWORK_CLIENT_NAME_LENGTH];
NetworkClientSocket *new_cs;
@@ -559,7 +559,7 @@ NetworkRecvStatus NetworkCloseClient(NetworkClientSocket *cs, NetworkRecvStatus
/* Inform other clients of this... strange leaving ;) */
FOR_ALL_CLIENT_SOCKETS(new_cs) {
- if (new_cs->status > STATUS_AUTH && cs != new_cs) {
+ if (new_cs->status > STATUS_AUTHORIZED && cs != new_cs) {
SEND_COMMAND(PACKET_SERVER_ERROR_QUIT)(new_cs, cs->client_id, NETWORK_ERROR_CONNECTION_LOST);
}
}
@@ -569,7 +569,7 @@ NetworkRecvStatus NetworkCloseClient(NetworkClientSocket *cs, NetworkRecvStatus
if (_network_server) {
/* We just lost one client :( */
- if (cs->status >= STATUS_AUTH) _network_game_info.clients_on--;
+ if (cs->status >= STATUS_AUTHORIZED) _network_game_info.clients_on--;
_network_clients_connected--;
SetWindowDirty(WC_CLIENT_LIST, 0);