diff options
| author | yexo <yexo@openttd.org> | 2009-05-26 11:40:14 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-05-26 11:40:14 +0000 |
| commit | a10e5f707a4dd893b5cf80faa189f669291a4906 (patch) | |
| tree | b3d88922ca83a9ab23f903e1db4c40781f3137fe /src/table | |
| parent | b19d0e0254883d0db9d8f3d01dacd94e0229f9ac (diff) | |
| download | openttd-a10e5f707a4dd893b5cf80faa189f669291a4906.tar.xz | |
(svn r16429) -Change: Make the company settings behave like all others settings: the default set in the main menu / config file is now really the default for a new company, and changing the value in game will no longer change the default for new companies.
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/settings.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/table/settings.h b/src/table/settings.h index 5fe05dba3..22632d785 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -14,9 +14,6 @@ static bool InvalidateTownViewWindow(int32 p1); static bool DeleteSelectStationWindow(int32 p1); static bool UpdateConsists(int32 p1); static bool CheckInterval(int32 p1); -static bool EngineRenewUpdate(int32 p1); -static bool EngineRenewMonthsUpdate(int32 p1); -static bool EngineRenewMoneyUpdate(int32 p1); static bool TrainAccelerationModelChanged(int32 p1); static bool DragSignalsDensityChanged(int32); static bool DifficultyReset(int32 level); @@ -208,6 +205,7 @@ static bool UpdateClientConfigValues(int32 p1); #define CR SGF_CURRENCY #define NN SGF_NO_NETWORK #define NG SGF_NEWGAME_ONLY +#define PC SGF_PER_COMPANY static const SettingDesc _music_settings[] = { SDT_VAR(MusicFileSettings, playlist, SLE_UINT8, S, 0, 0, 0, 5, 1, STR_NULL, NULL), @@ -547,9 +545,6 @@ const SettingDesc _settings[] = { SDTC_BOOL(gui.vehicle_income_warn, S, 0, true, STR_CONFIG_SETTING_WARN_INCOME_LESS, NULL), SDTC_VAR(gui.order_review_system, SLE_UINT8, S, MS, 2, 0, 2, 0, STR_CONFIG_SETTING_ORDER_REVIEW, NULL), SDTC_BOOL(gui.lost_train_warn, S, 0, true, STR_CONFIG_SETTING_WARN_LOST_TRAIN, NULL), - SDTC_BOOL(company.engine_renew, S, 0, false, STR_CONFIG_SETTING_AUTORENEW_VEHICLE, EngineRenewUpdate), - SDTC_VAR(company.engine_renew_months, SLE_INT16, S, 0, 6, -12, 12, 0, STR_CONFIG_SETTING_AUTORENEW_MONTHS, EngineRenewMonthsUpdate), - SDTC_VAR(company.engine_renew_money, SLE_UINT, S, CR,100000, 0, 2000000, 0, STR_CONFIG_SETTING_AUTORENEW_MONEY, EngineRenewMoneyUpdate), SDTC_BOOL(gui.always_build_infrastructure, S, 0, false, STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE, RedrawScreen), SDTC_BOOL(gui.new_nonstop, S, 0, false, STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT, NULL), SDTC_VAR(gui.stop_location, SLE_UINT8, S, MS, 2, 0, 2, 1, STR_CONFIG_SETTING_STOP_LOCATION, NULL), @@ -619,6 +614,13 @@ const SettingDesc _settings[] = { SDT_END() }; +static const SettingDesc _company_settings[] = { + SDT_BOOL(CompanySettings, engine_renew, 0, PC, false, STR_CONFIG_SETTING_AUTORENEW_VEHICLE, NULL), + SDT_VAR(CompanySettings, engine_renew_months, SLE_INT16, 0, PC, 6, -12, 12, 0, STR_CONFIG_SETTING_AUTORENEW_MONTHS, NULL), + SDT_VAR(CompanySettings, engine_renew_money, SLE_UINT, 0, PC|CR,100000, 0, 2000000, 0, STR_CONFIG_SETTING_AUTORENEW_MONEY, NULL), + SDT_END() +}; + static const SettingDesc _currency_settings[] = { SDT_VAR(CurrencySpec, rate, SLE_UINT16, S, 0, 1, 0, UINT16_MAX, 0, STR_NULL, NULL), SDT_CHR(CurrencySpec, separator, S, 0, ".", STR_NULL, NULL), |