From 648ee88a02fef70172a108ed7bc511e27984d2c4 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Thu, 3 Jun 2021 20:55:03 +0200 Subject: Codechange: merge guiflags and flags in settings .ini files It was rather confusing which one was for what, especially as some SaveLoad flags were settings-only. Clean up this mess a bit by having only Setting flags. --- src/table/settings/win32_settings.ini | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/table/settings/win32_settings.ini') diff --git a/src/table/settings/win32_settings.ini b/src/table/settings/win32_settings.ini index 32a5cf5c9..df1e0cb27 100644 --- a/src/table/settings/win32_settings.ini +++ b/src/table/settings/win32_settings.ini @@ -17,15 +17,14 @@ static const SettingTable _win32_settings{ }; #endif /* _WIN32 */ [templates] -SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), -SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), +SDTG_BOOL = SDTG_BOOL($name, $flags, $var, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), +SDTG_VAR = SDTG_VAR($name, $type, $flags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), [validation] SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); [defaults] -flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC -guiflags = SF_NONE +flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC interval = 0 str = STR_NULL strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT -- cgit v1.2.3-70-g09d2