summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2021-01-08 22:11:57 +0100
committerMichael Lutz <michi@icosahedron.de>2021-02-14 14:16:40 +0100
commita2c3197f424daa6e02201d8304015b0eb67d0b04 (patch)
tree7d31da4159ad5e6811c43e02a0dfdf7caf90600c
parentf5555a6d262a77f3754934447d7440df381f37d9 (diff)
downloadopenttd-a2c3197f424daa6e02201d8304015b0eb67d0b04.tar.xz
Codechange: Make the settings for min/max zoom early load settings.
-rw-r--r--src/table/misc_settings.ini29
-rw-r--r--src/table/settings.ini27
2 files changed, 29 insertions, 27 deletions
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index edc779caf..be5088ec9 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -5,6 +5,8 @@
;
[pre-amble]
+static bool ZoomMinMaxChanged(int32 p1);
+
extern std::string _config_language_file;
static const char *_support8bppmodes = "no|system|hardware";
@@ -24,6 +26,7 @@ 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),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra),
+SDTC_VAR = SDTC_VAR($var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extra),
SDTG_END = SDTG_END()
[defaults]
@@ -303,6 +306,32 @@ 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_UINT8
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 2e085058f..e08cadafe 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -38,7 +38,6 @@ 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);
@@ -2791,32 +2790,6 @@ 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
-
-[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
-
[SDTC_BOOL]
var = gui.population_in_label
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC