diff options
| author | truelight <truelight@openttd.org> | 2004-12-20 16:02:01 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2004-12-20 16:02:01 +0000 |
| commit | 9938d19d76f4e5cffe727ce46b4bdef59c813ce7 (patch) | |
| tree | 0af8a168a8079b09ae4398464cf72f5fa503a523 /network_server.c | |
| parent | f3a8d2ad39b55748795a6170661376be5fe4caa7 (diff) | |
| download | openttd-9938d19d76f4e5cffe727ce46b4bdef59c813ce7.tar.xz | |
(svn r1186) -Fix: [Network] You can now join a company on a server where a company
went bankrupt, without joining the wrong company (or even failing to do so)
Diffstat (limited to 'network_server.c')
| -rw-r--r-- | network_server.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/network_server.c b/network_server.c index 9c448e12f..59665cfa9 100644 --- a/network_server.c +++ b/network_server.c @@ -67,8 +67,6 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_COMPANY_INFO) Packet *p; byte active = 0; - byte current = 0; - FOR_ALL_PLAYERS(player) { if (player->is_active) @@ -91,13 +89,11 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_COMPANY_INFO) if (!player->is_active) continue; - current++; - p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO); NetworkSend_uint8 (p, NETWORK_COMPANY_INFO_VERSION); NetworkSend_uint8 (p, active); - NetworkSend_uint8 (p, current); + NetworkSend_uint8 (p, player->index); NetworkSend_string(p, _network_player_info[player->index].company_name); NetworkSend_uint8 (p, _network_player_info[player->index].inaugurated_year); @@ -119,6 +115,13 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_COMPANY_INFO) NetworkSend_Packet(p, cs); } + + p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO); + + NetworkSend_uint8 (p, NETWORK_COMPANY_INFO_VERSION); + NetworkSend_uint8 (p, 0); + + NetworkSend_Packet(p, cs); } DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR)(NetworkClientState *cs, NetworkErrorCode error) |