diff options
author | rubidium42 <rubidium@openttd.org> | 2021-05-29 09:12:11 +0200 |
---|---|---|
committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-29 10:32:32 +0200 |
commit | 4c0e083128a4e9c3eefefaab70648057bd1d9fb2 (patch) | |
tree | 0600dc53d8d3b46f563880ca1b750acf7cdf06cd /src/table/company_settings.ini | |
parent | 4144e949edf3b14c2d478aa0fcba1996942a03fa (diff) | |
download | openttd-4c0e083128a4e9c3eefefaab70648057bd1d9fb2.tar.xz |
Cleanup: set the base in the setting templates, instead of defining the base for every setting
This has the added benefit of not getting mistaken that multiple bases can be used for the same SettingTable
Diffstat (limited to 'src/table/company_settings.ini')
-rw-r--r-- | src/table/company_settings.ini | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/table/company_settings.ini b/src/table/company_settings.ini index 019c26dd9..bb104adeb 100644 --- a/src/table/company_settings.ini +++ b/src/table/company_settings.ini @@ -13,11 +13,11 @@ static const SettingTable _company_settings{ [post-amble] }; [templates] -SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), -SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), +SDT_BOOL = SDT_BOOL(CompanySettings, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), +SDT_VAR = SDT_VAR(CompanySettings, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), [validation] -SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for $base.$var exceeds storage size"); +SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for CompanySettings.$var exceeds storage size"); [defaults] flags = 0 @@ -38,7 +38,6 @@ startup = false [SDT_BOOL] -base = CompanySettings var = engine_renew def = true str = STR_CONFIG_SETTING_AUTORENEW_VEHICLE @@ -46,7 +45,6 @@ strhelp = STR_CONFIG_SETTING_AUTORENEW_VEHICLE_HELPTEXT cat = SC_BASIC [SDT_VAR] -base = CompanySettings var = engine_renew_months type = SLE_INT16 guiflags = SGF_PER_COMPANY | SGF_DISPLAY_ABS @@ -58,7 +56,6 @@ strhelp = STR_CONFIG_SETTING_AUTORENEW_MONTHS_HELPTEXT strval = STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_BEFORE [SDT_VAR] -base = CompanySettings var = engine_renew_money type = SLE_UINT guiflags = SGF_PER_COMPANY | SGF_CURRENCY @@ -70,12 +67,10 @@ strhelp = STR_CONFIG_SETTING_AUTORENEW_MONEY_HELPTEXT strval = STR_JUST_CURRENCY_LONG [SDT_BOOL] -base = CompanySettings var = renew_keep_length def = false [SDT_BOOL] -base = CompanySettings var = vehicle.servint_ispercent def = false str = STR_CONFIG_SETTING_SERVINT_ISPERCENT @@ -83,7 +78,6 @@ strhelp = STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT post_cb = UpdateServiceInterval [SDT_VAR] -base = CompanySettings var = vehicle.servint_trains type = SLE_UINT16 guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED @@ -97,7 +91,6 @@ pre_cb = [](auto new_value) { return CanUpdateServiceInterval(VEH_TRAIN, new_v post_cb = [](auto new_value) { UpdateServiceInterval(VEH_TRAIN, new_value); } [SDT_VAR] -base = CompanySettings var = vehicle.servint_roadveh type = SLE_UINT16 guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED @@ -111,7 +104,6 @@ pre_cb = [](auto new_value) { return CanUpdateServiceInterval(VEH_ROAD, new_va post_cb = [](auto new_value) { UpdateServiceInterval(VEH_ROAD, new_value); } [SDT_VAR] -base = CompanySettings var = vehicle.servint_ships type = SLE_UINT16 guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED @@ -125,7 +117,6 @@ pre_cb = [](auto new_value) { return CanUpdateServiceInterval(VEH_SHIP, new_va post_cb = [](auto new_value) { UpdateServiceInterval(VEH_SHIP, new_value); } [SDT_VAR] -base = CompanySettings var = vehicle.servint_aircraft type = SLE_UINT16 guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED |