diff options
| -rw-r--r-- | src/company_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_client.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 8a36945a6..860246f5c 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -813,7 +813,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /* Has the network client a correct ClientIndex? */ if (!(flags & DC_EXEC)) return CommandCost(); NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(cid); - if (ci != NULL) return CommandCost(); + if (ci == NULL) return CommandCost(); /* Delete multiplayer progress bar */ DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 9c3e2639a..f4d49539e 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -420,8 +420,11 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO) } // We don't have this client_id yet, find an empty client_id, and put the data there - ci = NetworkFindClientInfoFromClientID(INVALID_CLIENT_ID); - if (ci != NULL) { + for (int i = 0; i < MAX_CLIENT_SLOTS; i++) { + ci = GetNetworkClientInfo(i); + if (!ci->IsValid()) break; + } + if (ci != GetNetworkClientInfo(MAX_CLIENT_SLOTS)) { ci->client_id = client_id; ci->client_playas = playas; |