diff options
| author | smatz <smatz@openttd.org> | 2009-06-23 12:11:35 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-06-23 12:11:35 +0000 |
| commit | 22cf8d8480b1a7e1627590ba2c48ab5019764910 (patch) | |
| tree | 3e214ab81c40d56ef452fa5af33712e0be087fba /src/network | |
| parent | 192b9bda7b7405e2f71b1847430b744a67b923ef (diff) | |
| download | openttd-22cf8d8480b1a7e1627590ba2c48ab5019764910.tar.xz | |
(svn r16634) -Codechange: use Company::IsHumanID() instead of IsHumanCompany()
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network_server.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 889885482..1ae3d64b0 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1230,10 +1230,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_MOVE) { CompanyID company_id = (Owner)p->Recv_uint8(); - /* Check if the company is valid */ - if (!Company::IsValidID(company_id) && company_id != COMPANY_SPECTATOR) return; - /* We don't allow moving to AI companies */ - if (company_id != COMPANY_SPECTATOR && Company::Get(company_id)->is_ai) return; + /* Check if the company is valid, we don't allow moving to AI companies */ + if (company_id != COMPANY_SPECTATOR && !Company::IsValidHumanID(company_id)) return; /* Check if we require a password for this company */ if (company_id != COMPANY_SPECTATOR && !StrEmpty(_network_company_states[company_id].password)) { |