summaryrefslogtreecommitdiff
path: root/src/table
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-02-04 22:14:16 +0000
committermichi_cc <michi_cc@openttd.org>2012-02-04 22:14:16 +0000
commitdd5d24c35a8806cdb9937cdb9e45a2ed2d093811 (patch)
treeadfdc7e365fe02b08b2dbe9674a6d90adb76429a /src/table
parentc9e664d4cb0f31f0a9b7ca589af8dedd58d2c155 (diff)
downloadopenttd-dd5d24c35a8806cdb9937cdb9e45a2ed2d093811.tar.xz
(svn r23895) -Revert (r23888): Broken and not even needed anymore in the container format 2 implementation that was committed.
Diffstat (limited to 'src/table')
-rw-r--r--src/table/misc_settings.ini27
-rw-r--r--src/table/settings.ini25
2 files changed, 25 insertions, 27 deletions
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index 8415a4d26..d9206d838 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -8,7 +8,6 @@
[pre-amble]
extern char _config_language_file[MAX_PATH];
-static bool ZoomMinMaxChanged(int32 p1);
static const SettingDescGlobVarList _misc_settings[] = {
[post-amble]
@@ -272,31 +271,5 @@ def = 100
min = 0
max = UINT32_MAX
-[SDTG_VAR]
-name = ""zoom_min""
-type = SLE_UINT8
-var = _settings_client.gui.zoom_min
-flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
-def = ZOOM_LVL_MIN
-min = ZOOM_LVL_MIN
-max = ZOOM_LVL_GUI
-str = STR_CONFIG_SETTING_ZOOM_MIN
-strval = STR_CONFIG_SETTING_ZOOM_LVL_MIN
-proc = ZoomMinMaxChanged
-
-[SDTG_VAR]
-name = ""zoom_max""
-type = SLE_UINT8
-var = _settings_client.gui.zoom_max
-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
-strval = STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X
-proc = ZoomMinMaxChanged
-
[SDTG_END]
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 511ce2077..aec498f82 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -40,6 +40,7 @@ static bool InvalidateIndustryViewWindow(int32 p1);
static bool InvalidateAISettingsWindow(int32 p1);
static bool RedrawTownAuthority(int32 p1);
static bool InvalidateCompanyInfrastructureWindow(int32 p1);
+static bool ZoomMinMaxChanged(int32 p1);
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1);
@@ -2079,6 +2080,30 @@ max = 255
interval = 1
str = STR_CONFIG_SETTING_SOFT_LIMIT
+[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_GUI
+str = STR_CONFIG_SETTING_ZOOM_MIN
+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
+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