diff options
| author | rubidium <rubidium@openttd.org> | 2010-08-18 17:06:45 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-08-18 17:06:45 +0000 |
| commit | 69fa0b36d3bb043858621ac0b32d451674ed2719 (patch) | |
| tree | f345c20f27f03cdc6e8fa9b7ddd0803739a83c96 /src/network | |
| parent | 287ee8c01d900ef15bd434e61607c0f341ec2d7e (diff) | |
| download | openttd-69fa0b36d3bb043858621ac0b32d451674ed2719.tar.xz | |
(svn r20542) -Codechange: generalise the setting of "p2" to the ClientID.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network_server.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index d2f3ce3ab..a363c2058 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -933,12 +933,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) return SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_COMPANY_MISMATCH); } - /** - * @todo CMD_COMPANY_CTRL with p1 = 0 announces a new company to the server. To give the - * company the correct ID, the server injects p2 and executes the command. Any other p1 - * is prohibited. Pretty ugly and should be redone together with its function. - * @see CmdCompanyCtrl() - */ if (cp.cmd == CMD_COMPANY_CTRL) { if (cp.p1 != 0 || cp.company != COMPANY_SPECTATOR) { return SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_CHEATER); @@ -949,10 +943,10 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_CLIENT, ci->client_id, "cannot create new company, server full", CLIENT_ID_SERVER); return NETWORK_RECV_STATUS_OKAY; } - - cp.p2 = cs->client_id; } + if (GetCommandFlags(cp.cmd) & CMD_CLIENT_ID) cp.p2 = cs->client_id; + /* The frame can be executed in the same frame as the next frame-packet * That frame just before that frame is saved in _frame_counter_max */ cp.frame = _frame_counter_max + 1; @@ -1505,7 +1499,7 @@ static void NetworkAutoCleanCompanies() /* Is the company empty for autoclean_unprotected-months, and is there no protection? */ if (_settings_client.network.autoclean_unprotected != 0 && _network_company_states[c->index].months_empty > _settings_client.network.autoclean_unprotected && StrEmpty(_network_company_states[c->index].password)) { /* Shut the company down */ - DoCommandP(0, 2, c->index, CMD_COMPANY_CTRL); + DoCommandP(0, 2 | c->index << 16, 0, CMD_COMPANY_CTRL); IConsolePrintF(CC_DEFAULT, "Auto-cleaned company #%d with no password", c->index + 1); } /* Is the company empty for autoclean_protected-months, and there is a protection? */ @@ -1519,7 +1513,7 @@ static void NetworkAutoCleanCompanies() /* Is the company empty for autoclean_novehicles-months, and has no vehicles? */ if (_settings_client.network.autoclean_novehicles != 0 && _network_company_states[c->index].months_empty > _settings_client.network.autoclean_novehicles && vehicles_in_company[c->index] == 0) { /* Shut the company down */ - DoCommandP(0, 2, c->index, CMD_COMPANY_CTRL); + DoCommandP(0, 2 | c->index << 16, 0, CMD_COMPANY_CTRL); IConsolePrintF(CC_DEFAULT, "Auto-cleaned company #%d with no vehicles", c->index + 1); } } else { |