mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23895) -Revert (r23888): Broken and not even needed anymore in the container format 2 implementation that was committed.

release/1.2
michi_cc 2012-02-04 22:14:16 +00:00
parent c9e664d4cb
commit dd5d24c35a
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/table/misc_settings.ini
View File

@ -8,7 +8,6 @@
[pre-amble] [pre-amble]
extern char _config_language_file[MAX_PATH]; extern char _config_language_file[MAX_PATH];
static bool ZoomMinMaxChanged(int32 p1);
static const SettingDescGlobVarList _misc_settings[] = { static const SettingDescGlobVarList _misc_settings[] = {
[post-amble] [post-amble]
@ -272,31 +271,5 @@ def = 100
min = 0 min = 0
max = UINT32_MAX 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] [SDTG_END]

25
src/table/settings.ini
View File

@ -40,6 +40,7 @@ static bool InvalidateIndustryViewWindow(int32 p1);
static bool InvalidateAISettingsWindow(int32 p1); static bool InvalidateAISettingsWindow(int32 p1);
static bool RedrawTownAuthority(int32 p1); static bool RedrawTownAuthority(int32 p1);
static bool InvalidateCompanyInfrastructureWindow(int32 p1); static bool InvalidateCompanyInfrastructureWindow(int32 p1);
static bool ZoomMinMaxChanged(int32 p1);
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1); static bool UpdateClientName(int32 p1);
@ -2079,6 +2080,30 @@ max = 255
interval = 1 interval = 1
str = STR_CONFIG_SETTING_SOFT_LIMIT 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] [SDTC_BOOL]
var = gui.population_in_label var = gui.population_in_label
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC