diff options
author | yexo <yexo@openttd.org> | 2009-05-15 23:55:06 +0000 |
---|---|---|
committer | yexo <yexo@openttd.org> | 2009-05-15 23:55:06 +0000 |
commit | 31eff1d4c30803e09083320886630da8b28690d1 (patch) | |
tree | b8c0c563425389a5e9514760bb5e1cc9cf0013c1 /src/company_cmd.cpp | |
parent | aea2fcd0a09fa47caf022934ba8029ec327906f7 (diff) | |
download | openttd-31eff1d4c30803e09083320886630da8b28690d1.tar.xz |
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
Diffstat (limited to 'src/company_cmd.cpp')
-rw-r--r-- | src/company_cmd.cpp | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index e5f31029f..77e8ddeb3 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -78,9 +78,7 @@ void SetLocalCompany(CompanyID new_company) /* Do not update the settings if we are in the intro GUI */ if (IsValidCompanyID(new_company) && _game_mode != GM_MENU) { const Company *c = GetCompany(new_company); - _settings_client.gui.autorenew = c->engine_renew; - _settings_client.gui.autorenew_months = c->engine_renew_months; - _settings_client.gui.autorenew_money = c->engine_renew_money; + _settings_client.company = c->settings; InvalidateWindow(WC_GAME_OPTIONS, 0); } @@ -568,12 +566,12 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui Company *c = GetCompany(_current_company); switch (GB(p1, 0, 3)) { case 0: - if (c->engine_renew == HasBit(p2, 0)) return CMD_ERROR; + if (c->settings.engine_renew == HasBit(p2, 0)) return CMD_ERROR; if (flags & DC_EXEC) { - c->engine_renew = HasBit(p2, 0); + c->settings.engine_renew = HasBit(p2, 0); if (IsLocalCompany()) { - _settings_client.gui.autorenew = c->engine_renew; + _settings_client.company.engine_renew = c->settings.engine_renew; InvalidateWindow(WC_GAME_OPTIONS, 0); } } @@ -581,12 +579,12 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui case 1: if (Clamp((int16)p2, -12, 12) != (int16)p2) return CMD_ERROR; - if (c->engine_renew_months == (int16)p2) return CMD_ERROR; + if (c->settings.engine_renew_months == (int16)p2) return CMD_ERROR; if (flags & DC_EXEC) { - c->engine_renew_months = (int16)p2; + c->settings.engine_renew_months = (int16)p2; if (IsLocalCompany()) { - _settings_client.gui.autorenew_months = c->engine_renew_months; + _settings_client.company.engine_renew_months = c->settings.engine_renew_months; InvalidateWindow(WC_GAME_OPTIONS, 0); } } @@ -594,12 +592,12 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui case 2: if (ClampU(p2, 0, 2000000) != p2) return CMD_ERROR; - if (c->engine_renew_money == p2) return CMD_ERROR; + if (c->settings.engine_renew_money == p2) return CMD_ERROR; if (flags & DC_EXEC) { - c->engine_renew_money = p2; + c->settings.engine_renew_money = p2; if (IsLocalCompany()) { - _settings_client.gui.autorenew_money = c->engine_renew_money; + _settings_client.company.engine_renew_money = c->settings.engine_renew_money; InvalidateWindow(WC_GAME_OPTIONS, 0); } } @@ -630,24 +628,24 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui if (ClampU(p2, 0, 2000000) != p2) return CMD_ERROR; if (flags & DC_EXEC) { - c->engine_renew = HasBit(p1, 15); - c->engine_renew_months = (int16)GB(p1, 16, 16); - c->engine_renew_money = p2; + c->settings.engine_renew = HasBit(p1, 15); + c->settings.engine_renew_months = (int16)GB(p1, 16, 16); + c->settings.engine_renew_money = p2; if (IsLocalCompany()) { - _settings_client.gui.autorenew = c->engine_renew; - _settings_client.gui.autorenew_months = c->engine_renew_months; - _settings_client.gui.autorenew_money = c->engine_renew_money; + _settings_client.company.engine_renew = c->settings.engine_renew; + _settings_client.company.engine_renew_months = c->settings.engine_renew_months; + _settings_client.company.engine_renew_money = c->settings.engine_renew_money; InvalidateWindow(WC_GAME_OPTIONS, 0); } } break; case 5: - if (c->renew_keep_length == HasBit(p2, 0)) return CMD_ERROR; + if (c->settings.renew_keep_length == HasBit(p2, 0)) return CMD_ERROR; if (flags & DC_EXEC) { - c->renew_keep_length = HasBit(p2, 0); + c->settings.renew_keep_length = HasBit(p2, 0); if (IsLocalCompany()) { InvalidateWindow(WC_REPLACE_VEHICLE, VEH_TRAIN); } @@ -750,8 +748,8 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 /* This is the client (or non-dedicated server) who wants a new company */ 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; + uint32 p1 = (_settings_client.company.engine_renew << 15 ) | (_settings_client.company.engine_renew_months << 16) | 4; + uint32 p2 = _settings_client.company.engine_renew_money; assert(_local_company == COMPANY_SPECTATOR); SetLocalCompany(c->index); if (!StrEmpty(_settings_client.network.default_company_pass)) { |