@@ -1117,7 +1117,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME
STR_CONFIG_SETTING_RESTRICT_LABEL :{BLACK}Show:
STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Restricts the list below showing only changed settings
STR_CONFIG_SETTING_RESTRICT_ALL :All settings
STR_CONFIG_SETTING_RESTRICT_BASIC :Basic settings
STR_CONFIG_SETTING_RESTRICT_ADVANCED :Advanced settings
STR_CONFIG_SETTING_RESTRICT_ALL :Expert settings / all settings
STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Settings with a different value than the default
STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Non-client settings with a different value than the default
STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Settings with a different value than your new-game settings
@@ -997,6 +997,8 @@ struct SettingEntrySetting {
/** How the list of advanced settings is filtered. */
enum RestrictionMode {
RM_BASIC, ///< Display settings associated to the "basic" list.
RM_ADVANCED, ///< Display settings associated to the "advanced" list.
RM_ALL, ///< List all settings regardless of the default/newgame/... values.
RM_CHANGED_AGAINST_DEFAULT, ///< Show only settings which are different compared to default values.
RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL, ///< Show only non-local settings which are different compared to default values.
@@ -1302,6 +1304,9 @@ bool SettingEntry::IsVisibleByRestrictio
return false;
}
if (mode == RM_BASIC) return (this->d.entry.setting->desc.cat & SC_BASIC_LIST) != 0;
if (mode == RM_ADVANCED) return (this->d.entry.setting->desc.cat & SC_ADVANCED_LIST) != 0;
/* Read the current value. */
const void *var = ResolveVariableAddress(settings_ptr, sd);
int64 current_value = ReadValue(var, sd->save.conv);
@@ -1942,6 +1947,8 @@ static SettingEntry _settings_main[] = {
static SettingsPage _settings_main_page = {_settings_main, lengthof(_settings_main)};
static const StringID _game_settings_restrict_dropdown[] = {
STR_CONFIG_SETTING_RESTRICT_BASIC, // RM_BASIC
STR_CONFIG_SETTING_RESTRICT_ADVANCED, // RM_ADVANCED
STR_CONFIG_SETTING_RESTRICT_ALL, // RM_ALL
STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT, // RM_CHANGED_AGAINST_DEFAULT
STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL, // RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL
@@ -1970,7 +1977,7 @@ struct GameSettingsWindow : QueryStringB
Scrollbar *vscroll;
GameSettingsWindow(const WindowDesc *desc) : QueryStringBaseWindow(50), cur_restriction_mode(RM_ALL)
GameSettingsWindow(const WindowDesc *desc) : QueryStringBaseWindow(50), cur_restriction_mode(RM_BASIC)
{
static bool first_time = true;
@@ -52,6 +52,30 @@ enum SettingGuiFlagLong {
DECLARE_ENUM_AS_BIT_SET(SettingGuiFlagLong)
typedef SimpleTinyEnumT<SettingGuiFlagLong, uint16> SettingGuiFlag;
/**
* A SettingCategory defines a grouping of the settings.
* The group #SC_BASIC is intended for settings which also a novice player would like to change and is able to understand.
* The group #SC_ADVANCED is intended for settings which an experienced player would like to use. This is the case for most settings.
* Finally #SC_EXPERT settings only few people want to see in rare cases.
* The grouping is meant to be inclusive, i.e. all settings in #SC_BASIC also will be included
* in the set of settings in #SC_ADVANCED. The group #SC_EXPERT contains all settings.
*/
enum SettingCategory {
SC_NONE = 0,
/* Filters for the list */
SC_BASIC_LIST = 1 << 0, ///< Settings displayed in the list of basic settings.
SC_ADVANCED_LIST = 1 << 1, ///< Settings displayed in the list of advanced settings.
SC_EXPERT_LIST = 1 << 2, ///< Settings displayed in the list of expert settings.
/* Setting classification */
SC_BASIC = SC_BASIC_LIST | SC_ADVANCED_LIST | SC_EXPERT_LIST, ///< Basic settings are part of all lists.
SC_ADVANCED = SC_ADVANCED_LIST | SC_EXPERT_LIST, ///< Advanced settings are part of advanced and expert list.
SC_EXPERT = SC_EXPERT_LIST, ///< Expert settings can only be seen in the expert list.
SC_END,
};
typedef bool OnChange(int32 var); ///< callback prototype on data modification
typedef size_t OnConvert(const char *value); ///< callback prototype for convertion error
@@ -71,6 +95,7 @@ struct SettingDescBase {
StringID str_val; ///< (Translated) first string describing the value.
OnChange *proc; ///< callback procedure for when the value is changed
OnConvert *proc_cnvt; ///< callback procedure when loading value mechanism fails
SettingCategory cat; ///< assigned categories of the setting
struct SettingDesc {
@@ -14,8 +14,8 @@ static const SettingDesc _company_settin
[post-amble]
[templates]
SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to),
SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDT_END = SDT_END()
[defaults]
@@ -29,6 +29,7 @@ proc = NULL
load = NULL
from = 0
to = SL_MAX_VERSION
cat = SC_ADVANCED
@@ -11,9 +11,9 @@ static const SettingDesc _currency_setti
SDT_CHR = SDT_CHR($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDT_CHR = SDT_CHR($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDT_STR = SDT_STR($base, $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
@@ -27,6 +27,7 @@ proc = NULL
@@ -42,6 +43,7 @@ max = UINT16_MAX
base = CurrencySpec
var = separator
def = "".""
cat = SC_BASIC
[SDT_VAR]
@@ -36,11 +36,11 @@ static const SettingDesc _gameopt_settin
SDTG_GENERAL = SDTG_GENERAL($name, $sdt_cmd, $sle_cmd, $type, $flags, $guiflags, $var, $length, $def, $min, $max, $interval, $full, $str, $strhelp, $strval, $proc, $from, $to),
SDTG_GENERAL = SDTG_GENERAL($name, $sdt_cmd, $sle_cmd, $type, $flags, $guiflags, $var, $length, $def, $min, $max, $interval, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDT_NULL = SDT_NULL($length, $from, $to),
SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to),
SDT_OMANY = SDT_OMANY($base, $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $load),
SDTC_OMANY = SDTC_OMANY( $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDT_OMANY = SDT_OMANY($base, $var, $type, $flags, $guiflags, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $load, $cat),
@@ -54,6 +54,7 @@ proc = NULL
@@ -93,6 +94,7 @@ type = SLE_UINT8
def = 3
min = 0
max = 3
[SDT_OMANY]
base = GameSettings
@@ -102,6 +104,7 @@ flags = SLF_NO_NETWORK_SYNC
def = 0
max = CUSTOM_CURRENCY_ID
full = _locale_currencies
@@ -111,6 +114,7 @@ flags = SLF_NO_NETWORK_SYNC
def = 1
max = 2
full = _locale_units
# There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow
# these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI.
@@ -121,6 +125,7 @@ type = SLE_UINT8
max = 255
full = _town_names
@@ -130,6 +135,7 @@ def = 0
full = _climates
load = ConvertLandscape
@@ -157,6 +163,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
max = 4
full = _autosave_interval
@@ -165,6 +172,7 @@ type = SLE_UINT8
max = 1
full = _roadsides
[SDT_END]
@@ -13,11 +13,11 @@ static const SettingDescGlobVarList _mis
SDTG_LIST = SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDTG_MMANY = SDTG_MMANY($name, $type, $flags, $guiflags, $var, $def, $full, $str, $strhelp, $strval, $proc, $from, $to),
SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to),
SDTG_LIST = SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_MMANY = SDTG_MMANY($name, $type, $flags, $guiflags, $var, $def, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_END = SDTG_END()
@@ -31,6 +31,7 @@ proc = NULL
@@ -50,42 +51,49 @@ def = true
name = ""fullscreen""
var = _fullscreen
def = false
[SDTG_STR]
name = ""graphicsset""
type = SLE_STRQ
var = BaseGraphics::ini_set
def = NULL
name = ""soundsset""
var = BaseSounds::ini_set
name = ""musicset""
var = BaseMusic::ini_set
name = ""videodriver""
var = _ini_videodriver
cat = SC_EXPERT
name = ""musicdriver""
var = _ini_musicdriver
name = ""sounddriver""
var = _ini_sounddriver
name = ""blitter""
@@ -98,6 +106,7 @@ name = ""language""
type = SLE_STRB
var = _config_language_file
; workaround for implicit lengthof() in SDTG_LIST
[SDTG_LIST]
@@ -106,18 +115,21 @@ type = SLE_INT
length = 2
var = _cur_resolution
def = ""640,480""
name = ""screenshot_format""
var = _screenshot_format_name
name = ""savegame_format""
var = _savegame_format
[SDTG_BOOL]
name = ""rightclick_emulate""
@@ -219,6 +231,7 @@ var = _sprite_cache_size
def = 128
min = 1
max = 512
[SDTG_VAR]
name = ""player_face""
@@ -227,6 +240,7 @@ var = _company_manager_face
max = 0xFFFFFFFF
name = ""transparency_options""
@@ -235,6 +249,7 @@ var = _transparency_opt
max = 0x1FF
name = ""transparency_locks""
@@ -243,6 +258,7 @@ var = _transparency_lock
name = ""invisibility_options""
@@ -251,18 +267,21 @@ var = _invisibility_opt
max = 0xFF
name = ""keyboard""
var = _keyboard_opt[0]
name = ""keyboard_caps""
var = _keyboard_opt[1]
name = ""last_newgrf_count""
@@ -271,6 +290,7 @@ var = _settings_client.gui.last_new
def = 100
max = UINT32_MAX
[SDTG_END]
@@ -46,81 +46,81 @@ static size_t ConvertLandscape(const cha
* on the appropriate macro.
#define NSD_GENERAL(name, def, cmd, guiflags, min, max, interval, many, str, strhelp, strval, proc, load)\
{name, (const void*)(size_t)(def), {(byte)cmd}, {(uint16)guiflags}, min, max, interval, many, str, strhelp, strval, proc, load}
#define NSD_GENERAL(name, def, cmd, guiflags, min, max, interval, many, str, strhelp, strval, proc, load, cat)\
{name, (const void*)(size_t)(def), {(byte)cmd}, {(uint16)guiflags}, min, max, interval, many, str, strhelp, strval, proc, load, cat}
/* Macros for various objects to go in the configuration file.
* This section is for global variables */
#define SDTG_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, var, length, def, min, max, interval, full, str, strhelp, strval, proc, from, to)\
{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, NULL), SLEG_GENERAL(sle_cmd, var, type | flags, length, from, to)}
#define SDTG_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, var, length, def, min, max, interval, full, str, strhelp, strval, proc, from, to, cat)\
{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, NULL, cat), SLEG_GENERAL(sle_cmd, var, type | flags, length, from, to)}
#define SDTG_VAR(name, type, flags, guiflags, var, def, min, max, interval, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(name, SDT_NUMX, SL_VAR, type, flags, guiflags, var, 0, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to)
#define SDTG_VAR(name, type, flags, guiflags, var, def, min, max, interval, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_NUMX, SL_VAR, type, flags, guiflags, var, 0, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTG_BOOL(name, flags, guiflags, var, def, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(name, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, var, 0, def, 0, 1, 0, NULL, str, strhelp, strval, proc, from, to)
#define SDTG_BOOL(name, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, var, 0, def, 0, 1, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTG_LIST(name, type, length, flags, guiflags, var, def, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(name, SDT_INTLIST, SL_ARR, type, flags, guiflags, var, length, def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to)
#define SDTG_LIST(name, type, length, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_INTLIST, SL_ARR, type, flags, guiflags, var, length, def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTG_STR(name, type, flags, guiflags, var, def, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, lengthof(var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to)
#define SDTG_STR(name, type, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, lengthof(var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTG_OMANY(name, type, flags, guiflags, var, def, max, full, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(name, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, max, 0, full, str, strhelp, strval, proc, from, to)
#define SDTG_OMANY(name, type, flags, guiflags, var, def, max, full, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
#define SDTG_MMANY(name, type, flags, guiflags, var, def, full, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(name, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, 0, 0, full, str, strhelp, strval, proc, from, to)
#define SDTG_MMANY(name, type, flags, guiflags, var, def, full, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, 0, 0, full, str, strhelp, strval, proc, from, to, cat)
#define SDTG_NULL(length, from, to)\
{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL}, SLEG_NULL(length, from, to)}
{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_NULL(length, from, to)}
#define SDTG_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL}, SLEG_END()}
#define SDTG_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_END()}
* This section is for structures where their various members are saved */
#define SDT_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, base, var, length, def, min, max, interval, full, str, strhelp, strval, proc, load, from, to)\
{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, load), SLE_GENERAL(sle_cmd, base, var, type | flags, length, from, to)}
#define SDT_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, base, var, length, def, min, max, interval, full, str, strhelp, strval, proc, load, from, to, cat)\
{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, load, cat), SLE_GENERAL(sle_cmd, base, var, type | flags, length, from, to)}
#define SDT_VAR(base, var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to)\
SDT_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, base, var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, NULL, from, to)
#define SDT_VAR(base, var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, base, var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_BOOL(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDT_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, base, var, 1, def, 0, 1, 0, NULL, str, strhelp, strval, proc, NULL, from, to)
#define SDT_BOOL(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, base, var, 1, def, 0, 1, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_LIST(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDT_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to)
#define SDT_LIST(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_STR(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to)
#define SDT_STR(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_CHR(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDT_GENERAL(#var, SDT_STRING, SL_VAR, SLE_CHAR, flags, guiflags, base, var, 1, def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to)
#define SDT_CHR(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDT_GENERAL(#var, SDT_STRING, SL_VAR, SLE_CHAR, flags, guiflags, base, var, 1, def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_OMANY(base, var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, load)\
SDT_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, load, from, to)
#define SDT_OMANY(base, var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, load, cat)\
SDT_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, load, from, to, cat)
#define SDT_MMANY(base, var, type, flags, guiflags, def, full, str, proc, strhelp, strval, from, to)\
SDT_GENERAL(#var, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, 0, 0, full, str, strhelp, strval, proc, NULL, from, to)
#define SDT_MMANY(base, var, type, flags, guiflags, def, full, str, proc, strhelp, strval, from, to, cat)\
SDT_GENERAL(#var, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, 0, 0, full, str, strhelp, strval, proc, NULL, from, to, cat)
#define SDT_NULL(length, from, to)\
{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL}, SLE_CONDNULL(length, from, to)}
{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_CONDNULL(length, from, to)}
#define SDTC_VAR(var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to)
#define SDTC_VAR(var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTC_BOOL(var, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, _settings_client.var, 1, def, 0, 1, 0, NULL, str, strhelp, strval, proc, from, to)
#define SDTC_BOOL(var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, _settings_client.var, 1, def, 0, 1, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTC_LIST(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to)
#define SDTC_LIST(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTC_STR(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to)
#define SDTC_STR(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
#define SDTC_OMANY(var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to)\
SDTG_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, from, to)
#define SDTC_OMANY(var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
#define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL}, SLE_END()}
#define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_END()}
@@ -63,17 +63,17 @@ const SettingDesc _settings[] = {
SDTC_BOOL = SDTC_BOOL( $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDTC_LIST = SDTC_LIST( $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDTC_STR = SDTC_STR( $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to),
SDTC_VAR = SDTC_VAR( $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to),
SDTC_BOOL = SDTC_BOOL( $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTC_LIST = SDTC_LIST( $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTC_STR = SDTC_STR( $var, $type, $flags, $guiflags, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTC_VAR = SDTC_VAR( $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat),
@@ -88,6 +88,7 @@ proc = NULL
@@ -103,6 +104,7 @@ min = 0
max = MAX_COMPANIES - 1
interval = 1
proc = MaxNoAIsChange
[SDT_NULL]
length = 1
@@ -121,6 +123,7 @@ max = 4
strval = STR_NUM_VERY_LOW
proc = DifficultyChange
@@ -134,6 +137,7 @@ max = ID_END - 1
strval = STR_FUNDING_ONLY
@@ -146,6 +150,7 @@ min = 100000
max = 500000
interval = 50000
@@ -158,6 +163,7 @@ min = 2
@@ -171,6 +177,7 @@ max = 2
strval = STR_SEA_LEVEL_LOW
@@ -183,6 +190,7 @@ max = 4
strval = STR_AI_SPEED_VERY_SLOW
@@ -200,6 +208,7 @@ max = 2
strval = STR_DISASTER_NONE
@@ -225,6 +234,7 @@ max = 2
@@ -238,6 +248,7 @@ max = 3
strval = STR_TERRAIN_TYPE_VERY_FLAT
@@ -251,6 +262,7 @@ max = 4
strval = STR_SEA_LEVEL_VERY_LOW
@@ -263,6 +275,7 @@ max = 1
strval = STR_ECONOMY_STEADY
@@ -287,6 +300,7 @@ max = 1
strval = STR_CONFIG_SETTING_OFF
@@ -309,6 +323,7 @@ def = 3
proc = DifficultyReset
; There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow
; these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI.
@@ -321,6 +336,7 @@ guiflags = SGF_NO_NETWORK
@@ -332,6 +348,7 @@ def = 0
; Snow line (or snow_line_height * TILE_HEIGHT)
@@ -359,6 +376,7 @@ guiflags = SGF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_BUILDONSLOPES
strhelp = STR_CONFIG_SETTING_BUILDONSLOPES_HELPTEXT
@@ -383,6 +401,7 @@ def = 64 << 16
max = 1 << 30
@@ -393,6 +412,7 @@ def = 4096
@@ -403,6 +423,7 @@ def = 64 << 16
@@ -413,6 +434,7 @@ def = 4096
@@ -423,6 +445,7 @@ def = 64 << 16
@@ -433,6 +456,7 @@ def = 4096
[SDT_BOOL]
@@ -441,6 +465,7 @@ from = 75
str = STR_CONFIG_SETTING_AUTOSLOPE
strhelp = STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT
@@ -494,6 +519,7 @@ str = STR_CONFIG_SETTING_SIGNALSIDE
strhelp = STR_CONFIG_SETTING_SIGNALSIDE_HELPTEXT
strval = STR_CONFIG_SETTING_SIGNALSIDE_LEFT
proc = RedrawScreen
@@ -541,6 +567,7 @@ str = STR_CONFIG_SETTING_TOWN_FOUND
strhelp = STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT
strval = STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN
proc = TownFoundingChanged
@@ -595,6 +622,7 @@ str = STR_CONFIG_SETTING_TRAIN_SLOP
strhelp = STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS_HELPTEXT
strval = STR_CONFIG_SETTING_PERCENTAGE
proc = TrainSlopeSteepnessChanged
@@ -609,6 +637,7 @@ str = STR_CONFIG_SETTING_ROAD_VEHIC
strhelp = STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT
proc = RoadVehSlopeSteepnessChanged
@@ -616,6 +645,7 @@ var = pf.forbid_90_deg
str = STR_CONFIG_SETTING_FORBID_90_DEG
strhelp = STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT
@@ -629,6 +659,7 @@ interval = 1
str = STR_CONFIG_SETTING_TRAIN_LENGTH
strhelp = STR_CONFIG_SETTING_TRAIN_LENGTH_HELPTEXT
strval = STR_CONFIG_SETTING_TILE_LENGTH
; vehicle.mammoth_trains
@@ -661,12 +692,14 @@ var = pf.roadveh_queue
str = STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING
strhelp = STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING_HELPTEXT
var = pf.new_pathfinding_all
to = 86
@@ -674,6 +707,7 @@ var = pf.yapf.ship_use_yapf
from = 28
@@ -681,6 +715,7 @@ var = pf.yapf.road_use_yapf
@@ -688,6 +723,7 @@ var = pf.yapf.rail_use_yapf
##
@@ -703,6 +739,7 @@ interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS
strhelp = STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT
strval = STR_CONFIG_SETTING_PATHFINDER_NPF
@@ -717,6 +754,7 @@ interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES
strhelp = STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_HELPTEXT
@@ -731,6 +769,7 @@ interval = 1
str = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS
strhelp = STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT
strval = STR_CONFIG_SETTING_PATHFINDER_OPF
@@ -751,6 +790,7 @@ str = STR_CONFIG_SETTING_MAX_TRAINS
strhelp = STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT
strval = STR_JUST_COMMA
@@ -763,6 +803,7 @@ str = STR_CONFIG_SETTING_MAX_ROAD_V
strhelp = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT
@@ -775,6 +816,7 @@ str = STR_CONFIG_SETTING_MAX_AIRCRA
strhelp = STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT
@@ -787,6 +829,7 @@ str = STR_CONFIG_SETTING_MAX_SHIPS
strhelp = STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT
name = NULL
@@ -860,6 +903,7 @@ def = false
str = STR_CONFIG_SETTING_DISABLE_ELRAILS
strhelp = STR_CONFIG_SETTING_DISABLE_ELRAILS_HELPTEXT
proc = SettingsDisableElrail
@@ -904,6 +948,7 @@ def = true
str = STR_CONFIG_SETTING_DYNAMIC_ENGINES
strhelp = STR_CONFIG_SETTING_DYNAMIC_ENGINES_HELPTEXT
proc = ChangeDynamicEngines
@@ -918,6 +963,7 @@ interval = 1
str = STR_CONFIG_SETTING_PLANE_CRASHES
strhelp = STR_CONFIG_SETTING_PLANE_CRASHES_HELPTEXT
strval = STR_CONFIG_SETTING_PLANE_CRASHES_NONE
; station.join_stations
@@ -937,6 +983,7 @@ guiflags = SGF_NO_NETWORK
str = STR_CONFIG_SETTING_IMPROVEDLOAD
strhelp = STR_CONFIG_SETTING_IMPROVEDLOAD_HELPTEXT
@@ -967,6 +1014,7 @@ str = STR_CONFIG_SETTING_STATION_SP
strhelp = STR_CONFIG_SETTING_STATION_SPREAD_HELPTEXT
proc = InvalidateStationBuildWindow
@@ -974,6 +1022,7 @@ var = order.serviceathelipad
str = STR_CONFIG_SETTING_SERVICEATHELIPAD
strhelp = STR_CONFIG_SETTING_SERVICEATHELIPAD_HELPTEXT
@@ -982,6 +1031,7 @@ def = true
str = STR_CONFIG_SETTING_CATCHMENT
strhelp = STR_CONFIG_SETTING_CATCHMENT_HELPTEXT
proc = StationCatchmentChanged
@@ -991,6 +1041,7 @@ guiflags = SGF_NO_NETWORK
str = STR_CONFIG_SETTING_GRADUAL_LOADING
strhelp = STR_CONFIG_SETTING_GRADUAL_LOADING_HELPTEXT
@@ -999,6 +1050,7 @@ from = 47
str = STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD
strhelp = STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT
@@ -1007,6 +1059,7 @@ from = 114
str = STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD
strhelp = STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT
@@ -1015,6 +1068,7 @@ from = 62
str = STR_CONFIG_SETTING_ADJACENT_STATIONS
strhelp = STR_CONFIG_SETTING_ADJACENT_STATIONS_HELPTEXT
@@ -1042,6 +1096,7 @@ var = economy.inflation
str = STR_CONFIG_SETTING_INFLATION
strhelp = STR_CONFIG_SETTING_INFLATION_HELPTEXT
@@ -1055,6 +1110,7 @@ str = STR_CONFIG_SETTING_RAW_INDUST
strhelp = STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT
strval = STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE
proc = InvalidateBuildIndustryWindow
@@ -1067,6 +1123,7 @@ max = 4
str = STR_CONFIG_SETTING_INDUSTRY_PLATFORM
strhelp = STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT
@@ -1086,6 +1143,7 @@ def = true
str = STR_CONFIG_SETTING_BRIBE
strhelp = STR_CONFIG_SETTING_BRIBE_HELPTEXT
proc = RedrawTownAuthority
@@ -1095,6 +1153,7 @@ def = true
str = STR_CONFIG_SETTING_ALLOW_EXCLUSIVE
strhelp = STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT
@@ -1104,6 +1163,7 @@ def = true
str = STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS
strhelp = STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT
@@ -1113,6 +1173,7 @@ def = true
str = STR_CONFIG_SETTING_ALLOW_FUND_ROAD
strhelp = STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT
@@ -1121,6 +1182,7 @@ from = 79
str = STR_CONFIG_SETTING_ALLOW_GIVE_MONEY
strhelp = STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT
@@ -1131,6 +1193,7 @@ min = MIN_SNOWLINE_HEIGHT
max = MAX_SNOWLINE_HEIGHT
str = STR_CONFIG_SETTING_SNOWLINE_HEIGHT
length = 4
@@ -1146,6 +1209,7 @@ max = MAX_YEAR
str = STR_CONFIG_SETTING_STARTING_YEAR
strval = STR_JUST_INT
@@ -1158,6 +1222,7 @@ def = true
str = STR_CONFIG_SETTING_SMOOTH_ECONOMY
strhelp = STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT
proc = InvalidateIndustryViewWindow
@@ -1177,6 +1242,7 @@ max = 100
str = STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE
strhelp = STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT
@@ -1225,6 +1291,7 @@ from = 77
str = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD
strhelp = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD_HELPTEXT
; previously ai-new setting.
@@ -1237,6 +1304,7 @@ var = ai.ai_in_multiplayer
str = STR_CONFIG_SETTING_AI_IN_MULTIPLAYER
strhelp = STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT
@@ -1279,6 +1347,7 @@ interval = 2500
str = STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES
strhelp = STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT
@@ -1288,6 +1357,7 @@ type = SLE_UINT8
max = 100
@@ -1296,6 +1366,7 @@ type = SLE_UINT8
def = 20
min = 5
max = 60
@@ -1312,6 +1383,7 @@ type = SLE_UINT8
def = 15
min = 2
@@ -1320,6 +1392,7 @@ type = SLE_UINT8
def = 41
@@ -1329,6 +1402,7 @@ from = 96
def = 800
min = 200
max = 65535
@@ -1338,6 +1412,7 @@ from = 96
def = 2000
min = 400
@@ -1347,6 +1422,7 @@ from = 96
def = 4000
min = 800
@@ -1356,6 +1432,7 @@ def = false
str = STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE
strhelp = STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT
proc = InvalidateCompanyInfrastructureWindow
@@ -1366,12 +1443,14 @@ from = 100
def = 30
var = pf.reserve_paths
from = 100
@@ -1381,6 +1460,7 @@ from = 100
@@ -1390,6 +1470,7 @@ type = SLE_UINT16
def = 4096
min = 64
@@ -1398,6 +1479,7 @@ type = SLE_UINT8
def = 48
min = 4
@@ -1407,6 +1489,7 @@ type = SLE_UINT
def = 10000
min = 500
max = 100000
@@ -1415,6 +1498,7 @@ type = SLE_UINT
def = 10 * NPF_TILE_LENGTH
@@ -1423,6 +1507,7 @@ type = SLE_UINT
def = 100 * NPF_TILE_LENGTH
@@ -1431,6 +1516,7 @@ type = SLE_UINT
@@ -1439,6 +1525,7 @@ type = SLE_UINT
def = 1 * NPF_TILE_LENGTH
@@ -1447,6 +1534,7 @@ type = SLE_UINT
@@ -1455,6 +1543,7 @@ type = SLE_UINT
@@ -1463,6 +1552,7 @@ type = SLE_UINT
def = 50 * NPF_TILE_LENGTH
@@ -1472,6 +1562,7 @@ from = 100
def = 3 * NPF_TILE_LENGTH
@@ -1481,6 +1572,7 @@ from = 100
def = 15 * NPF_TILE_LENGTH
@@ -1489,6 +1581,7 @@ type = SLE_UINT
def = 2 * NPF_TILE_LENGTH
@@ -1497,6 +1590,7 @@ type = SLE_UINT
@@ -1505,6 +1599,7 @@ type = SLE_UINT
@@ -1513,6 +1608,7 @@ type = SLE_UINT
@@ -1522,6 +1618,7 @@ from = 47
def = 8 * NPF_TILE_LENGTH
@@ -1531,6 +1628,7 @@ from = 130
@@ -1540,6 +1638,7 @@ from = 130
@@ -1549,6 +1648,7 @@ from = 131
def = 20 * NPF_TILE_LENGTH
max = 1000000
@@ -1556,6 +1656,7 @@ base = GameSettings
var = pf.yapf.disable_node_optimization
@@ -1565,12 +1666,14 @@ from = 28
var = pf.yapf.rail_firstred_twoway_eol
@@ -1580,6 +1683,7 @@ from = 28
def = 10 * YAPF_TILE_LENGTH
@@ -1589,6 +1693,7 @@ from = 28
def = 100 * YAPF_TILE_LENGTH
@@ -1598,6 +1703,7 @@ from = 28
@@ -1607,6 +1713,7 @@ from = 28
@@ -1616,6 +1723,7 @@ from = 28
@@ -1625,6 +1733,7 @@ from = 28
def = 2 * YAPF_TILE_LENGTH
@@ -1634,6 +1743,7 @@ from = 28
def = 1 * YAPF_TILE_LENGTH
@@ -1643,6 +1753,7 @@ from = 28
def = 6 * YAPF_TILE_LENGTH
@@ -1652,6 +1763,7 @@ from = 28
def = 50 * YAPF_TILE_LENGTH
@@ -1661,6 +1773,7 @@ from = 28
def = 3 * YAPF_TILE_LENGTH
@@ -1670,6 +1783,7 @@ from = 28
def = 10
@@ -1679,6 +1793,7 @@ from = 28
def = 500
min = -1000000
@@ -1688,6 +1803,7 @@ from = 28
def = -100
@@ -1697,6 +1813,7 @@ from = 28
def = 5
@@ -1706,6 +1823,7 @@ from = 100
@@ -1715,6 +1833,7 @@ from = 100
def = 8 * YAPF_TILE_LENGTH
@@ -1724,6 +1843,7 @@ from = 100
def = 15 * YAPF_TILE_LENGTH
@@ -1733,6 +1853,7 @@ from = 100
@@ -1742,6 +1863,7 @@ from = 33
max = 20000
@@ -1751,6 +1873,7 @@ from = 33
def = 0 * YAPF_TILE_LENGTH
@@ -1760,6 +1883,7 @@ from = 33
def = 40 * YAPF_TILE_LENGTH
@@ -1769,6 +1893,7 @@ from = 33
@@ -1778,6 +1903,7 @@ from = 33
@@ -1787,6 +1913,7 @@ from = 33
@@ -1796,6 +1923,7 @@ from = 33
@@ -1805,6 +1933,7 @@ from = 47
@@ -1814,6 +1943,7 @@ from = 130
@@ -1823,6 +1953,7 @@ from = 130
@@ -1832,6 +1963,7 @@ from = 131
def = 20 * YAPF_TILE_LENGTH
@@ -1869,6 +2001,7 @@ min = 0
str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN
strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH
@@ -1887,6 +2020,7 @@ from = 30
def = GENERATE_NEW_SEED
@@ -1911,6 +2045,7 @@ min = 0
str = STR_CONFIG_SETTING_HEIGHTMAP_ROTATION
strval = STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE
@@ -1922,6 +2057,7 @@ min = 0
max = 15
str = STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT
@@ -1932,6 +2068,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
def = 8
min = MIN_MAP_SIZE_BITS
max = MAX_MAP_SIZE_BITS
@@ -1941,6 +2078,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
@@ -1950,6 +2088,7 @@ def = true
str = STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES
strhelp = STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES_HELPTEXT
proc = CheckFreeformEdges
@@ -1968,6 +2107,7 @@ from = 115
max = 5000
@@ -1981,6 +2121,7 @@ max = 2
str = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT
strhelp = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT
strval = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE
@@ -1990,6 +2131,7 @@ from = 149
max = 90
@@ -1999,6 +2141,7 @@ from = 163
def = 16
@@ -2008,6 +2151,7 @@ from = 163
@@ -2030,6 +2174,7 @@ def = 0
@@ -2041,6 +2186,7 @@ def = 1
[SDT_STR]
@@ -2050,6 +2196,7 @@ from = 118
flags = SLF_NO_NETWORK_SYNC
@@ -2059,6 +2206,7 @@ from = 118
@@ -2068,6 +2216,7 @@ from = 126
;***************************************************************************
@@ -2080,11 +2229,13 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
[SDTC_BOOL]
var = gui.threaded_saves
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
[SDTC_OMANY]
var = gui.date_format_in_default_names
@@ -2104,6 +2255,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_SHOWFINANCES
strhelp = STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT
[SDTC_VAR]
var = gui.auto_scrolling
@@ -2116,6 +2268,7 @@ max = 3
str = STR_CONFIG_SETTING_AUTOSCROLL
strhelp = STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT
strval = STR_CONFIG_SETTING_AUTOSCROLL_DISABLED
var = gui.reverse_scroll
@@ -2123,6 +2276,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_REVERSE_SCROLLING
strhelp = STR_CONFIG_SETTING_REVERSE_SCROLLING_HELPTEXT
var = gui.smooth_scroll
@@ -2137,6 +2291,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING
strhelp = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT
var = gui.measure_tooltip
@@ -2144,6 +2299,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_MEASURE_TOOLTIP
strhelp = STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT
var = gui.errmsg_duration
@@ -2180,6 +2336,7 @@ str = STR_CONFIG_SETTING_TOOLBAR_PO
strhelp = STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT
strval = STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT
proc = v_PositionMainToolbar
var = gui.statusbar_pos
@@ -2193,6 +2350,7 @@ str = STR_CONFIG_SETTING_STATUSBAR_
strhelp = STR_CONFIG_SETTING_STATUSBAR_POS_HELPTEXT
proc = v_PositionStatusbar
var = gui.window_snap_radius
@@ -2205,6 +2363,7 @@ max = 32
str = STR_CONFIG_SETTING_SNAP_RADIUS
strhelp = STR_CONFIG_SETTING_SNAP_RADIUS_HELPTEXT
strval = STR_CONFIG_SETTING_SNAP_RADIUS_VALUE
var = gui.window_soft_limit
@@ -2218,6 +2377,7 @@ interval = 1
str = STR_CONFIG_SETTING_SOFT_LIMIT
strhelp = STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT
strval = STR_CONFIG_SETTING_SOFT_LIMIT_VALUE
var = gui.zoom_min
@@ -2292,6 +2452,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_PREFER_TEAMCHAT
strhelp = STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT
var = gui.scrollwheel_scrolling
@@ -2304,6 +2465,7 @@ max = 2
str = STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING
strhelp = STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING_HELPTEXT
strval = STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM
var = gui.scrollwheel_multiplier
@@ -2316,6 +2478,7 @@ interval = 1
str = STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER
strhelp = STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER_HELPTEXT
var = gui.pause_on_newgame
@@ -2323,6 +2486,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME
strhelp = STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME_HELPTEXT
var = gui.advanced_vehicle_list
@@ -2343,6 +2507,7 @@ def = false
str = STR_CONFIG_SETTING_TIMETABLE_IN_TICKS
strhelp = STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT
proc = InvalidateVehTimetableWindow
var = gui.timetable_arrival_departure
@@ -2358,6 +2523,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_QUICKGOTO
strhelp = STR_CONFIG_SETTING_QUICKGOTO_HELPTEXT
var = gui.loading_indicators
@@ -2371,6 +2537,7 @@ str = STR_CONFIG_SETTING_LOADING_IN
strhelp = STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT
strval = STR_CONFIG_SETTING_COMPANIES_OFF
var = gui.default_rail_type
@@ -2383,6 +2550,7 @@ max = 2
str = STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE
strhelp = STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT
strval = STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST
var = gui.enable_signal_gui
@@ -2391,6 +2559,7 @@ def = true
str = STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI
strhelp = STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI_HELPTEXT
proc = CloseSignalGUI
var = gui.coloured_news_year
@@ -2403,6 +2572,7 @@ interval = 1
str = STR_CONFIG_SETTING_COLOURED_NEWS_YEAR
strhelp = STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT
var = gui.drag_signals_density
@@ -2415,6 +2585,7 @@ str = STR_CONFIG_SETTING_DRAG_SIGNA
strhelp = STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT
strval = STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE
proc = DragSignalsDensityChanged
var = gui.drag_signals_fixed_distance
@@ -2422,6 +2593,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE
strhelp = STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE_HELPTEXT
var = gui.semaphore_build_before
@@ -2442,6 +2614,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_WARN_INCOME_LESS
strhelp = STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT
var = gui.order_review_system
@@ -2454,6 +2627,7 @@ max = 2
str = STR_CONFIG_SETTING_ORDER_REVIEW
strhelp = STR_CONFIG_SETTING_ORDER_REVIEW_HELPTEXT
strval = STR_CONFIG_SETTING_ORDER_REVIEW_OFF
var = gui.lost_vehicle_warn
@@ -2469,6 +2643,7 @@ def = true
str = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING
strhelp = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT
var = gui.new_nonstop
@@ -2476,6 +2651,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT
strhelp = STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT
var = gui.stop_location
@@ -2489,6 +2665,7 @@ interval = 1
str = STR_CONFIG_SETTING_STOP_LOCATION
strhelp = STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT
strval = STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END
var = gui.keep_all_autosave
@@ -2499,6 +2676,7 @@ def = false
var = gui.autosave_on_exit
var = gui.max_num_autosaves
@@ -2528,6 +2706,7 @@ def = false
str = STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION
strhelp = STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION_HELPTEXT
var = gui.default_signal_type
@@ -2541,6 +2720,7 @@ interval = 1
str = STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE
strhelp = STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE_HELPTEXT
strval = STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL
var = gui.cycle_signal_types
@@ -2570,16 +2750,19 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
max = 7
var = gui.station_dragdrop
var = gui.station_show_coverage
var = gui.persistent_buildingtools
@@ -2587,6 +2770,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
str = STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS
strhelp = STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT
var = gui.expenses_layout
@@ -2603,6 +2787,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
def = 25
max = UINT8_MAX
var = gui.graph_line_thickness
@@ -2636,18 +2821,21 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
var = gui.newgrf_developer_tools
proc = InvalidateNewGRFChangeWindows
var = gui.ai_developer_tools
proc = InvalidateAISettingsWindow
var = gui.scenario_developer
@@ -2659,6 +2847,7 @@ proc = InvalidateNewGRFChangeWindows
var = gui.newgrf_show_old_versions
var = gui.newgrf_default_palette
@@ -2672,6 +2861,7 @@ str = STR_CONFIG_SETTING_NEWGRF_DEF
strhelp = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_HELPTEXT
strval = STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS
proc = UpdateNewGRFConfigPalette
var = gui.console_backlog_timeout
@@ -2697,6 +2887,7 @@ def = 0
max = 5
var = music.music_vol
@@ -2706,6 +2897,7 @@ def = 127
max = 127
var = music.effect_vol
@@ -2715,28 +2907,33 @@ def = 127
[SDTC_LIST]
var = music.custom_1
type = SLE_UINT8
var = music.custom_2
var = music.playing
var = music.shuffle
ifdef = ENABLE_NETWORK
@@ -2746,6 +2943,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
def = 620
@@ -2755,6 +2953,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
@@ -2764,6 +2963,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
@@ -2774,6 +2974,7 @@ guiflags = SGF_NETWORK_ONLY
@@ -2784,6 +2985,7 @@ guiflags = SGF_NETWORK_ONLY
@@ -2794,6 +2996,7 @@ guiflags = SGF_NETWORK_ONLY
def = 2
@@ -2804,6 +3007,7 @@ guiflags = SGF_NETWORK_ONLY
@@ -2814,6 +3018,7 @@ guiflags = SGF_NETWORK_ONLY
@@ -2824,6 +3029,7 @@ guiflags = SGF_NETWORK_ONLY
def = 256
@@ -2834,6 +3040,7 @@ guiflags = SGF_NETWORK_ONLY
max = 32000
@@ -2891,6 +3098,7 @@ guiflags = SGF_NETWORK_ONLY
def = NETWORK_DEFAULT_PORT
@@ -2901,6 +3109,7 @@ guiflags = SGF_NETWORK_ONLY
def = NETWORK_ADMIN_PORT
@@ -2908,6 +3117,7 @@ var = network.server_admin_chat
guiflags = SGF_NETWORK_ONLY
@@ -2933,6 +3143,7 @@ type = SLE_STRB
proc = UpdateClientName
[SDTC_STR]
@@ -2942,6 +3153,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
proc = UpdateServerPassword
@@ -2951,6 +3163,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
proc = UpdateRconPassword
@@ -2959,6 +3172,7 @@ type = SLE_STRB
@@ -2974,6 +3188,7 @@ type = SLE_STRB
@@ -3037,6 +3252,7 @@ def = 15
max = MAX_COMPANIES
proc = UpdateClientConfigValues
@@ -3047,6 +3263,7 @@ guiflags = SGF_NETWORK_ONLY
max = MAX_CLIENTS
@@ -3058,6 +3275,7 @@ def = 15
@@ -3089,6 +3307,7 @@ guiflags = SGF_NETWORK_ONLY
max = 35
full = _server_langs
@@ -3096,6 +3315,7 @@ var = network.reload_cfg
@@ -3103,6 +3323,7 @@ var = network.last_host
def = """"
@@ -3112,12 +3333,14 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETW
max = UINT16_MAX
var = network.no_http_content_downloads
; Since the network code (CmdChangeSetting and friends) use the index in this array to decide
; which setting the server is talking about all conditional compilation of this array must be at the
@@ -3138,6 +3361,7 @@ max = 2
str = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU
strhelp = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT
strval = STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND
@@ -17,8 +17,8 @@ static const SettingDescGlobVarList _win
#endif /* WIN32 */
@@ -32,6 +32,7 @@ proc = NULL
@@ -42,11 +43,13 @@ var = _display_hz
max = 120
name = ""force_full_redraw""
var = _force_full_redraw
name = ""fullscreen_bpp""
@@ -55,11 +58,13 @@ var = _fullscreen_bpp
min = 8
max = 32
name = ""window_maximize""
var = _window_maximize
Status change: