diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini --- a/src/table/settings/gui_settings.ini +++ b/src/table/settings/gui_settings.ini @@ -16,7 +16,6 @@ static void InvalidateCompanyLiveryWindo static void InvalidateNewGRFChangeWindows(int32_t new_value); static void ZoomMinMaxChanged(int32_t new_value); static void SpriteZoomMinChanged(int32_t new_value); -void InitializeNumberFormats(); static constexpr std::initializer_list _osk_activation{"disabled", "double", "single", "immediately"}; static constexpr std::initializer_list _savegame_date{"long", "short", "iso"}; @@ -29,7 +28,6 @@ static const SettingVariant _gui_setting SDTC_BOOL = SDTC_BOOL( $var, $flags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to, $cat, $extra, $startup), SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $def, $max, $full, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to, $cat, $extra, $startup), SDTC_VAR = SDTC_VAR( $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to, $cat, $extra, $startup), -SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, 0, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), [validation] SDTC_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size"); @@ -905,27 +903,3 @@ post_cb = [](auto) { SetupWidgetDimensi cat = SC_BASIC startup = true -[SDTC_SSTR] -var = gui.number_format -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC -type = SLE_STRQ -def = nullptr -pre_cb = [](auto format) { NumberFormatSeparators separators; return !ParseNumberFormatSeparators(separators, format).has_value(); } -post_cb = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); } -startup = true - -[SDTC_SSTR] -var = gui.number_abbreviations -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC -type = SLE_STRQ -def = nullptr -pre_cb = [](auto format) { NumberAbbreviations abbreviations; return !ParseNumberAbbreviations(abbreviations, format).has_value(); } -post_cb = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); } -startup = true - -[SDTC_SSTR] -var = gui.digit_decimal_separator -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC -type = SLE_STRQ -def = nullptr -post_cb = [](auto) { MarkWholeScreenDirty(); }