diff options
author | Darkvater <darkvater@openttd.org> | 2006-10-14 15:49:43 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2006-10-14 15:49:43 +0000 |
commit | dad5d5dd72a32b3dbaea68c71e996f053fa557e7 (patch) | |
tree | 4d65683dddf832ac860c3ff0f26f99db4e9ea997 /network_client.c | |
parent | abb0fa7bc53d755463d6cb314ac6044b5dcb22af (diff) | |
download | openttd-dad5d5dd72a32b3dbaea68c71e996f053fa557e7.tar.xz |
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
put it into player.h where it belongs (instead of map.h)
Diffstat (limited to 'network_client.c')
-rw-r--r-- | network_client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/network_client.c b/network_client.c index 66532d28b..95e66a4d2 100644 --- a/network_client.c +++ b/network_client.c @@ -342,7 +342,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO) /* Are we a ai-network-client? Are we not joining as a SPECTATOR (playas == 0, means SPECTATOR) */ if (_ai.network_client && playas != 0) { - if (_ai.network_playas == OWNER_SPECTATOR) + if (_ai.network_playas == PLAYER_SPECTATOR) AI_StartNewAI(playas - 1); _ai.network_playas = playas - 1; @@ -521,16 +521,16 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) if (_network_playas == 0 || _network_playas > MAX_PLAYERS || !GetPlayer(_network_playas - 1)->is_active) { - if (_network_playas == OWNER_SPECTATOR) { + if (_network_playas == PLAYER_SPECTATOR) { // The client wants to be a spectator.. - _local_player = OWNER_SPECTATOR; + _local_player = PLAYER_SPECTATOR; DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); } else { /* We have arrived and ready to start playing; send a command to make a new player; * the server will give us a client-id and let us in */ _local_player = 0; NetworkSend_Command(0, 0, 0, CMD_PLAYER_CTRL, NULL); - _local_player = OWNER_SPECTATOR; + _local_player = PLAYER_SPECTATOR; } } else { // take control over an existing company @@ -544,9 +544,9 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) /* Check if we are an ai-network-client, and if so, disable GUI */ if (_ai.network_client) { _ai.network_playas = _local_player; - _local_player = OWNER_SPECTATOR; + _local_player = PLAYER_SPECTATOR; - if (_ai.network_playas != OWNER_SPECTATOR) { + if (_ai.network_playas != PLAYER_SPECTATOR) { /* If we didn't join the game as a spectator, activate the AI */ AI_StartNewAI(_ai.network_playas); } @@ -745,7 +745,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_NEWGAME) { // To trottle the reconnects a bit, every clients waits // his _local_player value before reconnecting - // OWNER_SPECTATOR is currently 255, so to avoid long wait periods + // PLAYER_SPECTATOR is currently 255, so to avoid long wait periods // set the max to 10. _network_reconnect = min(_local_player + 1, 10); _switch_mode_errorstr = STR_NETWORK_SERVER_REBOOT; |