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/gameopt_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/gameopt_settings.ini')
-rw-r--r-- | src/table/gameopt_settings.ini | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/table/gameopt_settings.ini b/src/table/gameopt_settings.ini index b0b1798ab..39caa45c9 100644 --- a/src/table/gameopt_settings.ini +++ b/src/table/gameopt_settings.ini @@ -23,7 +23,7 @@ static const char *_osk_activation = "disabled|double|single|immediately"; static const char *_settings_profiles = "easy|medium|hard"; static const char *_news_display = "off|summarized|full"; -static const SettingDesc _gameopt_settings[] = { +static const SettingTable _gameopt_settings{ /* In version 4 a new difficulty setting has been added to the difficulty settings, * town attitude towards demolishing. Needs special handling because some dimwit thought * it funny to have the GameDifficulty struct be an array while it is a struct of @@ -43,7 +43,6 @@ SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $guiflags, $def, $ma SDTG_OMANY = SDTG_OMANY($name, $type, $flags, $guiflags, $var, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDT_OMANY = SDT_OMANY($base, $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $load, $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] SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -186,6 +185,3 @@ def = 1 max = 1 full = _roadsides cat = SC_BASIC - -[SDT_END] - |