mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16292) -Fix (r16287): autorenew settings were set to 0 when creating a new company in multiplayer

release/1.0
yexo 2009-05-13 12:07:36 +00:00
parent aa0459309c
commit 67723e42aa
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/company_cmd.cpp
View File

@ -749,6 +749,9 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* This is the client (or non-dedicated server) who wants a new company */ /* This is the client (or non-dedicated server) who wants a new company */
if (cid == _network_own_client_id) { if (cid == _network_own_client_id) {
/* Create p1 and p2 here because SetLocalCompany resets the gui.autorenew* settings. */
uint32 p1 = (_settings_client.gui.autorenew << 15 ) | (_settings_client.gui.autorenew_months << 16) | 4;
uint32 p2 = _settings_client.gui.autorenew_money;
assert(_local_company == COMPANY_SPECTATOR); assert(_local_company == COMPANY_SPECTATOR);
SetLocalCompany(c->index); SetLocalCompany(c->index);
if (!StrEmpty(_settings_client.network.default_company_pass)) { if (!StrEmpty(_settings_client.network.default_company_pass)) {
@ -760,13 +763,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* Now that we have a new company, broadcast our autorenew settings to /* Now that we have a new company, broadcast our autorenew settings to
* all clients so everything is in sync */ * all clients so everything is in sync */
NetworkSend_Command(0, NetworkSend_Command(0, p1, p2, CMD_SET_AUTOREPLACE, NULL, NULL);
(_settings_client.gui.autorenew << 15 ) | (_settings_client.gui.autorenew_months << 16) | 4,
_settings_client.gui.autorenew_money,
CMD_SET_AUTOREPLACE,
NULL,
NULL
);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} }