diff options
| author | Michael Lutz <michi@icosahedron.de> | 2021-02-16 00:11:42 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-02-17 21:01:21 +0100 |
| commit | 8bd2349ab6d25a16b8ffc4e9b4ea541ca8d29610 (patch) | |
| tree | 01122205c78f824d3805ba7b8a4a335eb5a2d42b /src | |
| parent | 00c66e709647fdd8120e087e4bd7a074d1b5a90f (diff) | |
| download | openttd-8bd2349ab6d25a16b8ffc4e9b4ea541ca8d29610.tar.xz | |
Fix #8676, a2c3197f: GUI-visible settings may not be part of misc settings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/table/misc_settings.ini | 29 | ||||
| -rw-r--r-- | src/table/settings.ini | 29 |
2 files changed, 29 insertions, 29 deletions
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini index 32881b942..3add5148f 100644 --- a/src/table/misc_settings.ini +++ b/src/table/misc_settings.ini @@ -5,8 +5,6 @@ ; [pre-amble] -static bool ZoomMinMaxChanged(int32 p1); - extern std::string _config_language_file; static const char *_support8bppmodes = "no|system|hardware"; @@ -26,7 +24,6 @@ SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, SDTG_SSTR = SDTG_SSTR($name, $type, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), -SDTC_VAR = SDTC_VAR($var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra, $startup), SDTG_END = SDTG_END() [defaults] @@ -307,32 +304,6 @@ min = 0 max = UINT32_MAX cat = SC_EXPERT -[SDTC_VAR] -var = gui.zoom_min -type = SLE_UINT8 -flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC -guiflags = SGF_MULTISTRING -def = ZOOM_LVL_MIN -min = ZOOM_LVL_MIN -max = ZOOM_LVL_OUT_4X -str = STR_CONFIG_SETTING_ZOOM_MIN -strhelp = STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT -strval = STR_CONFIG_SETTING_ZOOM_LVL_MIN -proc = ZoomMinMaxChanged - -[SDTC_VAR] -var = gui.zoom_max -type = SLE_UINT8 -flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC -guiflags = SGF_MULTISTRING -def = ZOOM_LVL_MAX -min = ZOOM_LVL_OUT_8X -max = ZOOM_LVL_MAX -str = STR_CONFIG_SETTING_ZOOM_MAX -strhelp = STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT -strval = STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X -proc = ZoomMinMaxChanged - [SDTG_VAR] name = ""gui_zoom"" type = SLE_INT8 diff --git a/src/table/settings.ini b/src/table/settings.ini index 610d32015..1c68e6b73 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -38,6 +38,7 @@ static bool InvalidateAISettingsWindow(int32 p1); static bool RedrawTownAuthority(int32 p1); static bool InvalidateCompanyInfrastructureWindow(int32 p1); static bool InvalidateCompanyWindow(int32 p1); +static bool ZoomMinMaxChanged(int32 p1); static bool MaxVehiclesChanged(int32 p1); static bool InvalidateShipPathCache(int32 p1); @@ -2793,6 +2794,34 @@ strhelp = STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT strval = STR_CONFIG_SETTING_SOFT_LIMIT_VALUE cat = SC_EXPERT +[SDTC_VAR] +var = gui.zoom_min +type = SLE_UINT8 +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +guiflags = SGF_MULTISTRING +def = ZOOM_LVL_MIN +min = ZOOM_LVL_MIN +max = ZOOM_LVL_OUT_4X +str = STR_CONFIG_SETTING_ZOOM_MIN +strhelp = STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT +strval = STR_CONFIG_SETTING_ZOOM_LVL_MIN +proc = ZoomMinMaxChanged +startup = true + +[SDTC_VAR] +var = gui.zoom_max +type = SLE_UINT8 +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +guiflags = SGF_MULTISTRING +def = ZOOM_LVL_MAX +min = ZOOM_LVL_OUT_8X +max = ZOOM_LVL_MAX +str = STR_CONFIG_SETTING_ZOOM_MAX +strhelp = STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT +strval = STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X +proc = ZoomMinMaxChanged +startup = true + [SDTC_BOOL] var = gui.population_in_label flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC |