diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-10-17 22:16:46 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-10-17 22:16:46 +0000 |
| commit | b70e4cefb320a31b9d93295f9759bfaf798639ae (patch) | |
| tree | 3c5e7e6bcdb563a73452b3392ed9da9e30aa513c /network_client.c | |
| parent | 04e55aeacd9d91372af1b59cf43941482d0d8493 (diff) | |
| download | openttd-b70e4cefb320a31b9d93295f9759bfaf798639ae.tar.xz | |
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
correctly handle this ci->client_playas - 1 was used all over the code making
it pretty confusing at times. Use proper one-on-one values now. Special handling
is only needed for user-output to not to confuse users.
Diffstat (limited to 'network_client.c')
| -rw-r--r-- | network_client.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/network_client.c b/network_client.c index f9cec7feb..8061195ae 100644 --- a/network_client.c +++ b/network_client.c @@ -512,8 +512,8 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) SEND_COMMAND(PACKET_CLIENT_MAP_OK)(); // new company/spectator (invalid player) or company we want to join is not active - if (_network_playas == PLAYER_NEW_COMPANY || !IsValidPlayer(_network_playas - 1) || - !GetPlayer(_network_playas - 1)->is_active) { + if (_network_playas == PLAYER_NEW_COMPANY || !IsValidPlayer(_network_playas) || + !GetPlayer(_network_playas)->is_active) { if (_network_playas == PLAYER_SPECTATOR) { // The client wants to be a spectator.. @@ -527,7 +527,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) } } else { // take control over an existing company - _local_player = _network_playas - 1; + _local_player = _network_playas; _patches.autorenew = GetPlayer(_local_player)->engine_renew; _patches.autorenew_months = GetPlayer(_local_player)->engine_renew_months; _patches.autorenew_money = GetPlayer(_local_player)->engine_renew_money; @@ -631,10 +631,10 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT) break; case NETWORK_ACTION_CHAT_PLAYER: case NETWORK_ACTION_GIVE_MONEY: - /* For speak to player or give money, we need the player-name */ - if (ci_to->client_playas > MAX_PLAYERS) - return NETWORK_RECV_STATUS_OKAY; // This should never happen - GetString(name, GetPlayer(ci_to->client_playas-1)->name_1); + /* For speaking to player or give money, we need the player-name */ + if (!IsValidPlayer(ci_to->client_playas)) return NETWORK_RECV_STATUS_OKAY; // This should never happen + + GetString(name, GetPlayer(ci_to->client_playas)->name_1); ci = NetworkFindClientInfoFromIndex(_network_own_client_index); break; default: @@ -649,7 +649,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT) } if (ci != NULL) - NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas-1), self_send, name, "%s", msg); + NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas), self_send, name, "%s", msg); return NETWORK_RECV_STATUS_OKAY; } |