diff options
author | rubidium42 <rubidium@openttd.org> | 2021-05-18 21:01:42 +0200 |
---|---|---|
committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-27 18:49:43 +0200 |
commit | 3bb6ce8827b71ae1dcfde4a7836fb6c636fb5a67 (patch) | |
tree | 683666e0514c5acc04c698205a088c43afccc2ff /src/table/company_settings.ini | |
parent | 425d50372fab501acc97981953a6c002c0a750cf (diff) | |
download | openttd-3bb6ce8827b71ae1dcfde4a7836fb6c636fb5a67.tar.xz |
Codechange: use initializer_lists for the settings tables
Not using vectors as those require copying from the initializer list and that
makes unique_ptrs to the actual SettingDesc objects later impossible.
Diffstat (limited to 'src/table/company_settings.ini')
-rw-r--r-- | src/table/company_settings.ini | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/table/company_settings.ini b/src/table/company_settings.ini index eea2371fc..eecebb40e 100644 --- a/src/table/company_settings.ini +++ b/src/table/company_settings.ini @@ -12,13 +12,12 @@ static bool UpdateIntervalRoadVeh(int32 p1); static bool UpdateIntervalShips(int32 p1); static bool UpdateIntervalAircraft(int32 p1); -static const SettingDesc _company_settings[] = { +static const SettingTable _company_settings{ [post-amble] }; [templates] SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), -SDT_END = SDT_END() [validation] SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for $base.$var exceeds storage size"); @@ -136,8 +135,3 @@ str = STR_CONFIG_SETTING_SERVINT_AIRCRAFT strhelp = STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT strval = STR_CONFIG_SETTING_SERVINT_VALUE proc = UpdateIntervalAircraft - -[SDT_END] - - -}; |