summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-06-03 21:18:29 +0200
committerGitHub <noreply@github.com>2021-06-03 21:18:29 +0200
commitfeb2ddbefa5f6f702b996b00dfd92db53a52d174 (patch)
tree857856c235701578fe44dc862c0b60fd415761bc
parent28e90769f74e55ea7c8f75146d5b33e0aa777da8 (diff)
downloadopenttd-feb2ddbefa5f6f702b996b00dfd92db53a52d174.tar.xz
Codechange: rename SettingGuiFlag to SettingFlag (#9332)
It is a lovely organicly grown enum, where it started off with GUI-only flags, and after that a few flags got added that can be considered GUI-only (the GUI disables/enables based on them), to only have flags added that has nothing to do with the GUI. So be less confusing, and rename them to what they do. Additionally, I took this opportunity to rename 0ISDISABLED to reflect what it really does.
-rw-r--r--src/settings.cpp32
-rw-r--r--src/settings_gui.cpp24
-rw-r--r--src/settings_internal.h51
-rw-r--r--src/table/settings/company_settings.ini14
-rw-r--r--src/table/settings/currency_settings.ini2
-rw-r--r--src/table/settings/gameopt_settings.ini2
-rw-r--r--src/table/settings/misc_settings.ini2
-rw-r--r--src/table/settings/settings.ini308
-rw-r--r--src/table/settings/win32_settings.ini2
-rw-r--r--src/table/settings/window_settings.ini2
10 files changed, 219 insertions, 220 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index 619d762d2..aa1e915f8 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -386,9 +386,9 @@ void IntSettingDesc::MakeValueValidAndWrite(const void *object, int32 val) const
* Make the value valid given the limitations of this setting.
*
* In the case of int settings this is ensuring the value is between the minimum and
- * maximum value, with a special case for 0 if SGF_0ISDISABLED is set.
+ * maximum value, with a special case for 0 if SF_GUI_0_IS_SPECIAL is set.
* This is generally done by clamping the value so it is within the allowed value range.
- * However, for SGF_MULTISTRING the default is used when the value is not valid.
+ * However, for SF_GUI_DROPDOWN the default is used when the value is not valid.
* @param val The value to make valid.
*/
void IntSettingDesc::MakeValueValid(int32 &val) const
@@ -407,8 +407,8 @@ void IntSettingDesc::MakeValueValid(int32 &val) const
case SLE_VAR_U16:
case SLE_VAR_I32: {
/* Override the minimum value. No value below this->min, except special value 0 */
- if (!(this->flags & SGF_0ISDISABLED) || val != 0) {
- if (!(this->flags & SGF_MULTISTRING)) {
+ if (!(this->flags & SF_GUI_0_IS_SPECIAL) || val != 0) {
+ if (!(this->flags & SF_GUI_DROPDOWN)) {
/* Clamp value-type setting to its valid range */
val = Clamp(val, this->min, this->max);
} else if (val < this->min || val > (int32)this->max) {
@@ -421,8 +421,8 @@ void IntSettingDesc::MakeValueValid(int32 &val) const
case SLE_VAR_U32: {
/* Override the minimum value. No value below this->min, except special value 0 */
uint32 uval = (uint32)val;
- if (!(this->flags & SGF_0ISDISABLED) || uval != 0) {
- if (!(this->flags & SGF_MULTISTRING)) {
+ if (!(this->flags & SF_GUI_0_IS_SPECIAL) || uval != 0) {
+ if (!(this->flags & SF_GUI_DROPDOWN)) {
/* Clamp value-type setting to its valid range */
uval = ClampU(uval, this->min, this->max);
} else if (uval < (uint)this->min || uval > this->max) {
@@ -743,13 +743,13 @@ void IniSaveWindowSettings(IniFile *ini, const char *grpname, void *desc)
*/
bool SettingDesc::IsEditable(bool do_command) const
{
- if (!do_command && !(this->save.conv & SLF_NO_NETWORK_SYNC) && _networking && !_network_server && !(this->flags & SGF_PER_COMPANY)) return false;
- if ((this->flags & SGF_NETWORK_ONLY) && !_networking && _game_mode != GM_MENU) return false;
- if ((this->flags & SGF_NO_NETWORK) && _networking) return false;
- if ((this->flags & SGF_NEWGAME_ONLY) &&
+ if (!do_command && !(this->save.conv & SLF_NO_NETWORK_SYNC) && _networking && !_network_server && !(this->flags & SF_PER_COMPANY)) return false;
+ if ((this->flags & SF_NETWORK_ONLY) && !_networking && _game_mode != GM_MENU) return false;
+ if ((this->flags & SF_NO_NETWORK) && _networking) return false;
+ if ((this->flags & SF_NEWGAME_ONLY) &&
(_game_mode == GM_NORMAL ||
- (_game_mode == GM_EDITOR && !(this->flags & SGF_SCENEDIT_TOO)))) return false;
- if ((this->flags & SGF_SCENEDIT_ONLY) && _game_mode != GM_EDITOR) return false;
+ (_game_mode == GM_EDITOR && !(this->flags & SF_SCENEDIT_TOO)))) return false;
+ if ((this->flags & SF_SCENEDIT_ONLY) && _game_mode != GM_EDITOR) return false;
return true;
}
@@ -759,7 +759,7 @@ bool SettingDesc::IsEditable(bool do_command) const
*/
SettingType SettingDesc::GetType() const
{
- if (this->flags & SGF_PER_COMPANY) return ST_COMPANY;
+ if (this->flags & SF_PER_COMPANY) return ST_COMPANY;
return (this->save.conv & SLF_NOT_IN_SAVE) ? ST_CLIENT : ST_GAME;
}
@@ -1689,7 +1689,7 @@ void IntSettingDesc::ChangeValue(const void *object, int32 newval) const
this->Write(object, newval);
if (this->post_callback != nullptr) this->post_callback(newval);
- if (this->flags & SGF_NO_NETWORK) {
+ if (this->flags & SF_NO_NETWORK) {
GamelogStartAction(GLAT_SETTING);
GamelogSetting(this->name, oldval, newval);
GamelogStopAction();
@@ -1833,7 +1833,7 @@ CommandCost CmdChangeCompanySetting(TileIndex tile, DoCommandFlag flags, uint32
bool SetSettingValue(const IntSettingDesc *sd, int32 value, bool force_newgame)
{
const IntSettingDesc *setting = sd->AsIntSetting();
- if ((setting->flags & SGF_PER_COMPANY) != 0) {
+ if ((setting->flags & SF_PER_COMPANY) != 0) {
if (Company::IsValidID(_local_company) && _game_mode != GM_MENU) {
return DoCommandP(0, 0, value, CMD_CHANGE_COMPANY_SETTING, nullptr, setting->name);
}
@@ -1992,7 +1992,7 @@ void IConsoleGetSetting(const char *name, bool force_newgame)
sd->FormatValue(value, lastof(value), object);
const IntSettingDesc *int_setting = sd->AsIntSetting();
IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s' (min: %s%d, max: %u)",
- name, value, (sd->flags & SGF_0ISDISABLED) ? "(0) " : "", int_setting->min, int_setting->max);
+ name, value, (sd->flags & SF_GUI_0_IS_SPECIAL) ? "(0) " : "", int_setting->min, int_setting->max);
}
}
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index f038617d1..1bd58c13b 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1147,7 +1147,7 @@ bool SettingEntry::UpdateFilterState(SettingFilter &filter, bool force_visible)
static const void *ResolveObject(const GameSettings *settings_ptr, const IntSettingDesc *sd)
{
- if ((sd->flags & SGF_PER_COMPANY) != 0) {
+ if ((sd->flags & SF_PER_COMPANY) != 0) {
if (Company::IsValidID(_local_company) && _game_mode != GM_MENU) {
return &Company::Get(_local_company)->settings;
}
@@ -1166,13 +1166,13 @@ void SettingEntry::SetValueDParams(uint first_param, int32 value) const
if (this->setting->IsBoolSetting()) {
SetDParam(first_param++, value != 0 ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
} else {
- if ((this->setting->flags & SGF_MULTISTRING) != 0) {
+ if ((this->setting->flags & SF_GUI_DROPDOWN) != 0) {
SetDParam(first_param++, this->setting->str_val - this->setting->min + value);
- } else if ((this->setting->flags & SGF_DISPLAY_ABS) != 0) {
+ } else if ((this->setting->flags & SF_GUI_NEGATIVE_IS_SPECIAL) != 0) {
SetDParam(first_param++, this->setting->str_val + ((value >= 0) ? 1 : 0));
value = abs(value);
} else {
- SetDParam(first_param++, this->setting->str_val + ((value == 0 && (this->setting->flags & SGF_0ISDISABLED) != 0) ? 1 : 0));
+ SetDParam(first_param++, this->setting->str_val + ((value == 0 && (this->setting->flags & SF_GUI_0_IS_SPECIAL) != 0) ? 1 : 0));
}
SetDParam(first_param++, value);
}
@@ -1205,13 +1205,13 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, int left, int right,
if (sd->IsBoolSetting()) {
/* Draw checkbox for boolean-value either on/off */
DrawBoolButton(buttons_left, button_y, value != 0, editable);
- } else if ((sd->flags & SGF_MULTISTRING) != 0) {
+ } else if ((sd->flags & SF_GUI_DROPDOWN) != 0) {
/* Draw [v] button for settings of an enum-type */
DrawDropDownButton(buttons_left, button_y, COLOUR_YELLOW, state != 0, editable);
} else {
/* Draw [<][>] boxes for settings of an integer-type */
DrawArrowButtons(buttons_left, button_y, COLOUR_YELLOW, state,
- editable && value != (sd->flags & SGF_0ISDISABLED ? 0 : sd->min), editable && (uint32)value != sd->max);
+ editable && value != (sd->flags & SF_GUI_0_IS_SPECIAL ? 0 : sd->min), editable && (uint32)value != sd->max);
}
this->SetValueDParams(1, value);
DrawString(text_left, text_right, y + (SETTING_HEIGHT - FONT_HEIGHT_NORMAL) / 2, sd->str, highlight ? TC_WHITE : TC_LIGHT_BLUE);
@@ -2182,7 +2182,7 @@ struct GameSettingsWindow : Window {
int32 value = sd->Read(ResolveObject(settings_ptr, sd));
/* clicked on the icon on the left side. Either scroller, bool on/off or dropdown */
- if (x < SETTING_BUTTON_WIDTH && (sd->flags & SGF_MULTISTRING)) {
+ if (x < SETTING_BUTTON_WIDTH && (sd->flags & SF_GUI_DROPDOWN)) {
this->SetDisplayedHelpText(pe);
if (this->valuedropdown_entry == pe) {
@@ -2250,7 +2250,7 @@ struct GameSettingsWindow : Window {
if (value < sd->min) value = sd->min; // skip between "disabled" and minimum
} else {
value -= step;
- if (value < sd->min) value = (sd->flags & SGF_0ISDISABLED) ? 0 : sd->min;
+ if (value < sd->min) value = (sd->flags & SF_GUI_0_IS_SPECIAL) ? 0 : sd->min;
}
/* Set up scroller timeout for numeric values */
@@ -2271,10 +2271,10 @@ struct GameSettingsWindow : Window {
}
} else {
/* Only open editbox if clicked for the second time, and only for types where it is sensible for. */
- if (this->last_clicked == pe && !sd->IsBoolSetting() && !(sd->flags & SGF_MULTISTRING)) {
+ if (this->last_clicked == pe && !sd->IsBoolSetting() && !(sd->flags & SF_GUI_DROPDOWN)) {
int64 value64 = value;
/* Show the correct currency-translated value */
- if (sd->flags & SGF_CURRENCY) value64 *= _currency->rate;
+ if (sd->flags & SF_GUI_CURRENCY) value64 *= _currency->rate;
this->valuewindow_entry = pe;
SetDParam(0, value64);
@@ -2307,7 +2307,7 @@ struct GameSettingsWindow : Window {
long long llvalue = atoll(str);
/* Save the correct currency-translated value */
- if (sd->flags & SGF_CURRENCY) llvalue /= _currency->rate;
+ if (sd->flags & SF_GUI_CURRENCY) llvalue /= _currency->rate;
value = (int32)ClampToI32(llvalue);
} else {
@@ -2348,7 +2348,7 @@ struct GameSettingsWindow : Window {
/* Deal with drop down boxes on the panel. */
assert(this->valuedropdown_entry != nullptr);
const IntSettingDesc *sd = this->valuedropdown_entry->setting;
- assert(sd->flags & SGF_MULTISTRING);
+ assert(sd->flags & SF_GUI_DROPDOWN);
SetSettingValue(sd, index);
this->SetDirty();
diff --git a/src/settings_internal.h b/src/settings_internal.h
index 632d4081d..351c66ea3 100644
--- a/src/settings_internal.h
+++ b/src/settings_internal.h
@@ -12,21 +12,20 @@
#include "saveload/saveload.h"
-enum SettingGuiFlag : uint16 {
- /* 2 bytes allocated for a maximum of 16 flags. */
- SGF_NONE = 0,
- SGF_0ISDISABLED = 1 << 0, ///< a value of zero means the feature is disabled
- SGF_DISPLAY_ABS = 1 << 1, ///< display absolute value of the setting
- SGF_MULTISTRING = 1 << 2, ///< the value represents a limited number of string-options (internally integer)
- SGF_NETWORK_ONLY = 1 << 3, ///< this setting only applies to network games
- SGF_CURRENCY = 1 << 4, ///< the number represents money, so when reading value multiply by exchange rate
- SGF_NO_NETWORK = 1 << 5, ///< this setting does not apply to network games; it may not be changed during the game
- SGF_NEWGAME_ONLY = 1 << 6, ///< this setting cannot be changed in a game
- SGF_SCENEDIT_TOO = 1 << 7, ///< this setting can be changed in the scenario editor (only makes sense when SGF_NEWGAME_ONLY is set)
- SGF_PER_COMPANY = 1 << 8, ///< this setting can be different for each company (saved in company struct)
- SGF_SCENEDIT_ONLY = 1 << 9, ///< this setting can only be changed in the scenario editor
+enum SettingFlag : uint16 {
+ SF_NONE = 0,
+ SF_GUI_0_IS_SPECIAL = 1 << 0, ///< A value of zero is possible and has a custom string (the one after "strval").
+ SF_GUI_NEGATIVE_IS_SPECIAL = 1 << 1, ///< A negative value has another string (the one after "strval").
+ SF_GUI_DROPDOWN = 1 << 2, ///< The value represents a limited number of string-options (internally integer) presented as dropdown.
+ SF_GUI_CURRENCY = 1 << 3, ///< The number represents money, so when reading value multiply by exchange rate.
+ SF_NETWORK_ONLY = 1 << 4, ///< This setting only applies to network games.
+ SF_NO_NETWORK = 1 << 5, ///< This setting does not apply to network games; it may not be changed during the game.
+ SF_NEWGAME_ONLY = 1 << 6, ///< This setting cannot be changed in a game.
+ SF_SCENEDIT_TOO = 1 << 7, ///< This setting can be changed in the scenario editor (only makes sense when SF_NEWGAME_ONLY is set).
+ SF_SCENEDIT_ONLY = 1 << 8, ///< This setting can only be changed in the scenario editor.
+ SF_PER_COMPANY = 1 << 9, ///< This setting can be different for each company (saved in company struct).
};
-DECLARE_ENUM_AS_BIT_SET(SettingGuiFlag)
+DECLARE_ENUM_AS_BIT_SET(SettingFlag)
/**
* A SettingCategory defines a grouping of the settings.
@@ -67,14 +66,14 @@ struct IniItem;
/** Properties of config file settings. */
struct SettingDesc {
- SettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup) :
+ SettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup) :
name(name), flags(flags), startup(startup), save(save) {}
virtual ~SettingDesc() {}
- const char *name; ///< name of the setting. Used in configuration file and for console
- SettingGuiFlag flags; ///< handles how a setting would show up in the GUI (text/currency, etc.)
- bool startup; ///< setting has to be loaded directly at startup?
- SaveLoad save; ///< Internal structure (going to savegame, parts to config)
+ const char *name; ///< Name of the setting. Used in configuration file and for console.
+ SettingFlag flags; ///< Handles how a setting would show up in the GUI (text/currency, etc.).
+ bool startup; ///< Setting has to be loaded directly at startup?.
+ SaveLoad save; ///< Internal structure (going to savegame, parts to config).
bool IsEditable(bool do_command = false) const;
SettingType GetType() const;
@@ -138,7 +137,7 @@ struct IntSettingDesc : SettingDesc {
*/
typedef void PostChangeCallback(int32 value);
- IntSettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup, int32 def,
+ IntSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, int32 def,
int32 min, uint32 max, int32 interval, StringID str, StringID str_help, StringID str_val,
SettingCategory cat, PreChangeCheck pre_check, PostChangeCallback post_callback) :
SettingDesc(save, name, flags, startup), def(def), min(min), max(max), interval(interval),
@@ -180,7 +179,7 @@ private:
/** Boolean setting. */
struct BoolSettingDesc : IntSettingDesc {
- BoolSettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup, bool def,
+ BoolSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, bool def,
StringID str, StringID str_help, StringID str_val, SettingCategory cat,
PreChangeCheck pre_check, PostChangeCallback post_callback) :
IntSettingDesc(save, name, flags, startup, def, 0, 1, 0, str, str_help, str_val, cat,
@@ -196,7 +195,7 @@ struct BoolSettingDesc : IntSettingDesc {
struct OneOfManySettingDesc : IntSettingDesc {
typedef size_t OnConvert(const char *value); ///< callback prototype for conversion error
- OneOfManySettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup, int32 def,
+ OneOfManySettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, int32 def,
int32 max, StringID str, StringID str_help, StringID str_val, SettingCategory cat,
PreChangeCheck pre_check, PostChangeCallback post_callback,
std::initializer_list<const char *> many, OnConvert *many_cnvt) :
@@ -220,7 +219,7 @@ struct OneOfManySettingDesc : IntSettingDesc {
/** Many of many setting. */
struct ManyOfManySettingDesc : OneOfManySettingDesc {
- ManyOfManySettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup,
+ ManyOfManySettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup,
int32 def, StringID str, StringID str_help, StringID str_val, SettingCategory cat,
PreChangeCheck pre_check, PostChangeCallback post_callback,
std::initializer_list<const char *> many, OnConvert *many_cnvt) :
@@ -249,7 +248,7 @@ struct StringSettingDesc : SettingDesc {
*/
typedef void PostChangeCallback(const std::string &value);
- StringSettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup, const char *def,
+ StringSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, const char *def,
uint32 max_length, PreChangeCheck pre_check, PostChangeCallback post_callback) :
SettingDesc(save, name, flags, startup), def(def == nullptr ? "" : def), max_length(max_length),
pre_check(pre_check), post_callback(post_callback) {}
@@ -275,7 +274,7 @@ private:
/** List/array settings. */
struct ListSettingDesc : SettingDesc {
- ListSettingDesc(SaveLoad save, const char *name, SettingGuiFlag flags, bool startup, const char *def) :
+ ListSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, const char *def) :
SettingDesc(save, name, flags, startup), def(def) {}
virtual ~ListSettingDesc() {}
@@ -289,7 +288,7 @@ struct ListSettingDesc : SettingDesc {
/** Placeholder for settings that have been removed, but might still linger in the savegame. */
struct NullSettingDesc : SettingDesc {
NullSettingDesc(SaveLoad save) :
- SettingDesc(save, "", SGF_NONE, false) {}
+ SettingDesc(save, "", SF_NONE, false) {}
virtual ~NullSettingDesc() {}
void FormatValue(char *buf, const char *last, const void *object) const override { NOT_REACHED(); }
diff --git a/src/table/settings/company_settings.ini b/src/table/settings/company_settings.ini
index 576710065..6b6a17c96 100644
--- a/src/table/settings/company_settings.ini
+++ b/src/table/settings/company_settings.ini
@@ -24,7 +24,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for CompanySettings.$v
[defaults]
flags = 0
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
@@ -50,7 +50,7 @@ cat = SC_BASIC
[SDT_VAR]
var = engine_renew_months
type = SLE_INT16
-guiflags = SGF_PER_COMPANY | SGF_DISPLAY_ABS
+guiflags = SF_PER_COMPANY | SF_GUI_NEGATIVE_IS_SPECIAL
def = 6
min = -12
max = 12
@@ -61,7 +61,7 @@ strval = STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_BEFORE
[SDT_VAR]
var = engine_renew_money
type = SLE_UINT
-guiflags = SGF_PER_COMPANY | SGF_CURRENCY
+guiflags = SF_PER_COMPANY | SF_GUI_CURRENCY
def = 100000
min = 0
max = 2000000
@@ -83,7 +83,7 @@ post_cb = UpdateServiceInterval
[SDT_VAR]
var = vehicle.servint_trains
type = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
def = 150
min = 5
max = 800
@@ -96,7 +96,7 @@ post_cb = [](auto new_value) { UpdateServiceInterval(VEH_TRAIN, new_value); }
[SDT_VAR]
var = vehicle.servint_roadveh
type = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
def = 150
min = 5
max = 800
@@ -109,7 +109,7 @@ post_cb = [](auto new_value) { UpdateServiceInterval(VEH_ROAD, new_value); }
[SDT_VAR]
var = vehicle.servint_ships
type = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
def = 360
min = 5
max = 800
@@ -122,7 +122,7 @@ post_cb = [](auto new_value) { UpdateServiceInterval(VEH_SHIP, new_value); }
[SDT_VAR]
var = vehicle.servint_aircraft
type = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
def = 100
min = 5
max = 800
diff --git a/src/table/settings/currency_settings.ini b/src/table/settings/currency_settings.ini
index a10583150..8e359d5c0 100644
--- a/src/table/settings/currency_settings.ini
+++ b/src/table/settings/currency_settings.ini
@@ -19,7 +19,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for CurrencySpec.$var
[defaults]
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
diff --git a/src/table/settings/gameopt_settings.ini b/src/table/settings/gameopt_settings.ini
index f24adb17a..195bae365 100644
--- a/src/table/settings/gameopt_settings.ini
+++ b/src/table/settings/gameopt_settings.ini
@@ -63,7 +63,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for GameSettings.$var
[defaults]
flags = 0
-guiflags = SGF_NONE
+guiflags = SF_NONE
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
diff --git a/src/table/settings/misc_settings.ini b/src/table/settings/misc_settings.ini
index bafdf2369..45da1db52 100644
--- a/src/table/settings/misc_settings.ini
+++ b/src/table/settings/misc_settings.ini
@@ -37,7 +37,7 @@ SDTG_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds st
[defaults]
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini
index 9281ed662..be4d7ea94 100644
--- a/src/table/settings/settings.ini
+++ b/src/table/settings/settings.ini
@@ -77,7 +77,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for GameSettings.$var
[defaults]
flags = 0
-guiflags = SGF_NONE
+guiflags = SF_NONE
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
@@ -119,7 +119,7 @@ max = 3
var = difficulty.number_towns
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = 2
min = 0
max = 4
@@ -131,7 +131,7 @@ cat = SC_BASIC
var = difficulty.industry_density
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = ID_END - 1
min = 0
max = ID_END - 1
@@ -145,7 +145,7 @@ cat = SC_BASIC
var = difficulty.max_loan
type = SLE_UINT32
from = SLV_97
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_CURRENCY
+guiflags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_CURRENCY
def = 300000
min = 0
max = 2000000000
@@ -159,7 +159,7 @@ cat = SC_BASIC
var = difficulty.initial_interest
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
+guiflags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO
def = 2
min = 2
max = 4
@@ -172,7 +172,7 @@ strval = STR_CONFIG_SETTING_PERCENTAGE
var = difficulty.vehicle_costs
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_MULTISTRING
+guiflags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -186,7 +186,7 @@ cat = SC_BASIC
var = difficulty.competitor_speed
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 4
@@ -209,7 +209,7 @@ max = 2
var = difficulty.vehicle_breakdowns
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -223,7 +223,7 @@ cat = SC_BASIC
var = difficulty.subsidy_multiplier
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 3
@@ -236,7 +236,7 @@ strval = STR_SUBSIDY_X1_5
var = difficulty.construction_cost
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_MULTISTRING
+guiflags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -250,7 +250,7 @@ cat = SC_BASIC
var = difficulty.terrain_type
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 1
min = 0
max = 5
@@ -264,7 +264,7 @@ cat = SC_BASIC
var = difficulty.quantity_sea_lakes
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = 0
min = 0
max = 4
@@ -298,7 +298,7 @@ cat = SC_BASIC
var = difficulty.town_council_tolerance
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -326,7 +326,7 @@ cat = SC_BASIC
var = game_creation.town_name
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = 0
max = 255
full = _town_names
@@ -336,7 +336,7 @@ cat = SC_BASIC
var = game_creation.landscape
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 0
max = 3
full = _climates
@@ -356,7 +356,7 @@ to = SLV_164
var = vehicle.road_side
type = SLE_UINT8
from = SLV_97
-guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
+guiflags = SF_GUI_DROPDOWN | SF_NO_NETWORK
def = 1
max = 1
full = _roadsides
@@ -372,7 +372,7 @@ cat = SC_BASIC
var = construction.map_height_limit
type = SLE_UINT8
from = SLV_194
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_0ISDISABLED
+guiflags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_0_IS_SPECIAL
def = 0
min = MIN_MAP_HEIGHT_LIMIT
max = MAX_MAP_HEIGHT_LIMIT
@@ -388,7 +388,7 @@ cat = SC_ADVANCED
var = game_creation.heightmap_height
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
min = MIN_HEIGHTMAP_HEIGHT
max = MAX_MAP_HEIGHT_LIMIT
@@ -396,7 +396,7 @@ interval = 1
[SDT_BOOL]
var = construction.build_on_slopes
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
cat = SC_EXPERT
@@ -404,7 +404,7 @@ cat = SC_EXPERT
var = construction.command_pause_level
type = SLE_UINT8
from = SLV_154
-guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
+guiflags = SF_GUI_DROPDOWN | SF_NO_NETWORK
def = 1
min = 0
max = 3
@@ -491,7 +491,7 @@ strhelp = STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT
var = construction.max_bridge_length
type = SLE_UINT16
from = SLV_159
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = 64
min = 1
max = MAX_MAP_SIZE
@@ -504,7 +504,7 @@ strval = STR_CONFIG_SETTING_TILE_LENGTH
var = construction.max_bridge_height
type = SLE_UINT8
from = SLV_194
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = 12
min = 1
max = MAX_TILE_HEIGHT
@@ -518,7 +518,7 @@ cat = SC_EXPERT
var = construction.max_tunnel_length
type = SLE_UINT16
from = SLV_159
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = 64
min = 1
max = MAX_MAP_SIZE
@@ -535,7 +535,7 @@ to = SLV_159
[SDT_VAR]
var = construction.train_signal_side
type = SLE_UINT8
-guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
+guiflags = SF_GUI_DROPDOWN | SF_NO_NETWORK
def = 1
min = 0
max = 2
@@ -547,7 +547,7 @@ cat = SC_BASIC
[SDT_BOOL]
var = station.never_expire_airports
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = false
str = STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS
strhelp = STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT
@@ -556,7 +556,7 @@ strhelp = STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT
var = economy.town_layout
type = SLE_UINT8
from = SLV_59
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = TL_ORIGINAL
min = TL_BEGIN
max = NUM_TLS - 1
@@ -569,7 +569,7 @@ post_cb = TownFoundingChanged
[SDT_BOOL]
var = economy.allow_town_roads
from = SLV_113
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS
strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT
@@ -578,7 +578,7 @@ strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT
var = economy.found_town
type = SLE_UINT8
from = SLV_128
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = TF_FORBIDDEN
min = TF_BEGIN
max = TF_END - 1
@@ -592,7 +592,7 @@ cat = SC_BASIC
[SDT_BOOL]
var = economy.allow_town_level_crossings
from = SLV_143
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
@@ -601,7 +601,7 @@ strhelp = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
var = economy.town_cargogen_mode
type = SLE_UINT8
from = SLV_TOWN_CARGOGEN
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = TCGM_BITCOUNT
min = TCGM_BEGIN
max = TCGM_END - 1
@@ -644,7 +644,7 @@ extra = offsetof(LinkGraphSettings, recalc_time)
var = linkgraph.distribution_pax
type = SLE_UINT8
from = SLV_183
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = DT_MANUAL
min = DT_MIN
max = DT_MAX
@@ -659,7 +659,7 @@ extra = offsetof(LinkGraphSettings, distribution_pax)
var = linkgraph.distribution_mail
type = SLE_UINT8
from = SLV_183
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = DT_MANUAL
min = DT_MIN
max = DT_MAX
@@ -674,7 +674,7 @@ extra = offsetof(LinkGraphSettings, distribution_mail)
var = linkgraph.distribution_armoured
type = SLE_UINT8
from = SLV_183
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = DT_MANUAL
min = DT_MIN
max = DT_MAX
@@ -689,7 +689,7 @@ extra = offsetof(LinkGraphSettings, distribution_armoured)
var = linkgraph.distribution_default
type = SLE_UINT8
from = SLV_183
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = DT_MANUAL
min = DT_BEGIN
max = DT_MAX_NONSYMMETRIC
@@ -761,7 +761,7 @@ extra = offsetof(LinkGraphSettings, short_path_saturation)
[SDT_VAR]
var = vehicle.train_acceleration_model
type = SLE_UINT8
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 1
@@ -775,7 +775,7 @@ post_cb = TrainAccelerationModelChanged
var = vehicle.roadveh_acceleration_model
type = SLE_UINT8
from = SLV_139
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 1
@@ -843,7 +843,7 @@ to = SLV_159
var = vehicle.smoke_amount
type = SLE_UINT8
from = SLV_145
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -895,7 +895,7 @@ cat = SC_EXPERT
var = pf.pathfinder_for_trains
type = SLE_UINT8
from = SLV_87
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 1
max = 2
@@ -909,7 +909,7 @@ cat = SC_EXPERT
var = pf.pathfinder_for_roadvehs
type = SLE_UINT8
from = SLV_87
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 1
max = 2
@@ -923,7 +923,7 @@ cat = SC_EXPERT
var = pf.pathfinder_for_ships
type = SLE_UINT8
from = SLV_87
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 1
max = 2
@@ -936,7 +936,7 @@ cat = SC_EXPERT
[SDT_BOOL]
var = vehicle.never_expire_vehicles
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = false
str = STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES
strhelp = STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES_HELPTEXT
@@ -991,7 +991,7 @@ cat = SC_BASIC
[SDTG_BOOL]
name = nullptr
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
var = _old_vds.servint_ispercent
def = false
to = SLV_120
@@ -999,7 +999,7 @@ to = SLV_120
[SDTG_VAR]
name = nullptr
type = SLE_UINT16
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_trains
def = 150
min = 5
@@ -1009,7 +1009,7 @@ to = SLV_120
[SDTG_VAR]
name = nullptr
type = SLE_UINT16
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_roadveh
def = 150
min = 5
@@ -1019,7 +1019,7 @@ to = SLV_120
[SDTG_VAR]
name = nullptr
type = SLE_UINT16
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_ships
def = 360
min = 5
@@ -1029,7 +1029,7 @@ to = SLV_120
[SDTG_VAR]
name = nullptr
type = SLE_UINT16
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_aircraft
def = 150
min = 5
@@ -1044,7 +1044,7 @@ strhelp = STR_CONFIG_SETTING_NOSERVICE_HELPTEXT
[SDT_BOOL]
var = vehicle.wagon_speed_limits
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
str = STR_CONFIG_SETTING_WAGONSPEEDLIMITS
strhelp = STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT
@@ -1053,7 +1053,7 @@ post_cb = UpdateConsists
[SDT_BOOL]
var = vehicle.disable_elrails
from = SLV_38
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = false
str = STR_CONFIG_SETTING_DISABLE_ELRAILS
strhelp = STR_CONFIG_SETTING_DISABLE_ELRAILS_HELPTEXT
@@ -1064,7 +1064,7 @@ cat = SC_EXPERT
var = vehicle.freight_trains
type = SLE_UINT8
from = SLV_39
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = 1
min = 1
max = 255
@@ -1084,7 +1084,7 @@ to = SLV_159
var = vehicle.plane_speed
type = SLE_UINT8
from = SLV_90
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = 4
min = 1
max = 4
@@ -1095,7 +1095,7 @@ strval = STR_CONFIG_SETTING_PLANE_SPEED_VALUE
[SDT_BOOL]
var = vehicle.dynamic_engines
from = SLV_95
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
pre_cb = CheckDynamicEngines
cat = SC_EXPERT
@@ -1104,7 +1104,7 @@ cat = SC_EXPERT
var = vehicle.plane_crashes
type = SLE_UINT8
from = SLV_138
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 2
@@ -1127,7 +1127,7 @@ def = true
[SDT_BOOL]
var = order.improved_load
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
cat = SC_EXPERT
@@ -1185,7 +1185,7 @@ post_cb = StationCatchmentChanged
[SDT_BOOL]
var = order.gradual_loading
from = SLV_40
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = true
cat = SC_EXPERT
@@ -1214,7 +1214,7 @@ cat = SC_EXPERT
[SDT_BOOL]
var = economy.station_noise_level
from = SLV_96
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = false
str = STR_CONFIG_SETTING_NOISE_LEVEL
strhelp = STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT
@@ -1231,7 +1231,7 @@ post_cb = [](auto) { CloseWindowById(WC_SELECT_STATION, 0); }
##
[SDT_BOOL]
var = economy.inflation
-guiflags = SGF_NO_NETWORK
+guiflags = SF_NO_NETWORK
def = false
str = STR_CONFIG_SETTING_INFLATION
strhelp = STR_CONFIG_SETTING_INFLATION_HELPTEXT
@@ -1240,7 +1240,7 @@ cat = SC_BASIC
[SDT_VAR]
var = construction.raw_industry_construction
type = SLE_UINT8
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -1318,7 +1318,7 @@ cat = SC_BASIC
[SDT_VAR]
var = game_creation.snow_line_height
type = SLE_UINT8
-guiflags = SGF_SCENEDIT_ONLY
+guiflags = SF_SCENEDIT_ONLY
def = DEF_SNOWLINE_HEIGHT
min = MIN_SNOWLINE_HEIGHT
max = MAX_SNOWLINE_HEIGHT
@@ -1332,7 +1332,7 @@ cat = SC_BASIC
var = game_creation.snow_coverage
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = DEF_SNOW_COVERAGE
min = 0
max = 100
@@ -1346,7 +1346,7 @@ cat = SC_BASIC
var = game_creation.desert_coverage
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = DEF_DESERT_COVERAGE
min = 0
max = 100
@@ -1379,7 +1379,7 @@ to = SLV_105
var = game_creation.ending_year
type = SLE_INT32
from = SLV_ENDING_YEAR
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
def = DEF_END_YEAR
min = MIN_YEAR
max = MAX_YEAR - 1
@@ -1392,7 +1392,7 @@ cat = SC_ADVANCED
[SDT_VAR]
var = economy.type
type = SLE_UINT8
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = ET_SMOOTH
min = ET_BEGIN
max = ET_END - 1
@@ -1438,7 +1438,7 @@ cat = SC_EXPERT
var = economy.town_growth_rate
type = SLE_UINT8
from = SLV_54
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 4
@@ -1450,7 +1450,7 @@ strval = STR_CONFIG_SETTING_TOWN_GROWTH_NONE
var = economy.larger_towns
type = SLE_UINT8
from = SLV_54
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
def = 4
min = 0
max = 255
@@ -1486,7 +1486,7 @@ to = SLV_107
var = script.settings_profile
type = SLE_UINT8
from = SLV_178
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = SP_EASY
min = SP_EASY
max = SP_HARD
@@ -1531,7 +1531,7 @@ strhelp = STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT
var = script.script_max_opcode_till_suspend
type = SLE_UINT32
from = SLV_107
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = 10000
min = 500
max = 250000
@@ -1545,7 +1545,7 @@ cat = SC_EXPERT
var = script.script_max_memory_megabytes
type = SLE_UINT32
from = SLV_SCRIPT_MEMLIMIT
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = 1024
min = 8
max = 8192
@@ -2119,7 +2119,7 @@ cat = SC_EXPERT
var = game_creation.land_generator
type = SLE_UINT8
from = SLV_30
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 1
min = 0
max = 1
@@ -2142,7 +2142,7 @@ strhelp = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT
var = game_creation.tgen_smoothness
type = SLE_UINT8
from = SLV_30
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 1
min = TGEN_SMOOTHNESS_BEGIN
max = TGEN_SMOOTHNESS_END - 1
@@ -2155,7 +2155,7 @@ cat = SC_BASIC
var = game_creation.variety
type = SLE_UINT8
from = SLV_197
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 0
min = 0
max = 5
@@ -2176,7 +2176,7 @@ cat = SC_EXPERT
var = game_creation.tree_placer
type = SLE_UINT8
from = SLV_30
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY | SF_SCENEDIT_TOO
def = 2
min = 0
max = 2
@@ -2189,7 +2189,7 @@ cat = SC_BASIC
var = game_creation.heightmap_rotation
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 1
@@ -2256,7 +2256,7 @@ cat = SC_BASIC
var = construction.extra_tree_placement
type = SLE_UINT8
from = SLV_132
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 3
@@ -2269,7 +2269,7 @@ cat = SC_BASIC
var = game_creation.custom_terrain_type
type = SLE_UINT8
from = SLV_MAPGEN_SETTINGS_REVAMP
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SF_NEWGAME_ONLY
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
min = MIN_CUSTOM_TERRAIN_TYPE
max = MAX_MAP_HEIGHT_LIMIT
@@ -2306,7 +2306,7 @@ cat = SC_EXPERT
var = game_creation.amount_of_rivers
type = SLE_UINT8
from = SLV_163
-guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
+guiflags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 2
min = 0
max = 3
@@ -2345,7 +2345,7 @@ var = locale.units_velocity
type = SLE_UINT8
from = SLV_184
flags = SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 3
full = _locale_units
@@ -2360,7 +2360,7 @@ var = locale.units_power
type = SLE_UINT8
from = SLV_184
flags = SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _locale_units
@@ -2375,7 +2375,7 @@ var = locale.units_weight
type = SLE_UINT8
from = SLV_184
flags = SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _locale_units
@@ -2390,7 +2390,7 @@ var = locale.units_volume
type = SLE_UINT8
from = SLV_184
flags = SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _locale_units
@@ -2405,7 +2405,7 @@ var = locale.units_force
type = SLE_UINT8
from = SLV_184
flags = SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _locale_units
@@ -2420,7 +2420,7 @@ var = locale.units_height
type = SLE_UINT8
from = SLV_184
flags = SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _locale_units
@@ -2465,7 +2465,7 @@ cat = SC_BASIC
var = gui.autosave
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 4
full = _autosave_interval
@@ -2484,7 +2484,7 @@ cat = SC_EXPERT
var = gui.date_format_in_default_names
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _savegame_date
@@ -2504,7 +2504,7 @@ cat = SC_BASIC
var = gui.auto_scrolling
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 3
@@ -2517,7 +2517,7 @@ cat = SC_BASIC
var = gui.scroll_mode
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 3
@@ -2547,7 +2547,7 @@ ifdef = __APPLE__
var = gui.right_mouse_btn_emulation
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -2579,7 +2579,7 @@ strval = STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE
var = gui.hover_delay_ms
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
def = 250
min = 50
max = 6000
@@ -2595,7 +2595,7 @@ flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
str = STR_CONFIG_SETTING_OSK_ACTIVATION
strhelp = STR_CONFIG_SETTING_OSK_ACTIVATION_HELPTEXT
strval = STR_CONFIG_SETTING_OSK_ACTIVATION_DISABLED
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
full = _osk_activation
def = 1
min = 0
@@ -2606,7 +2606,7 @@ cat = SC_BASIC
var = gui.toolbar_pos
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -2620,7 +2620,7 @@ cat = SC_BASIC
var = gui.statusbar_pos
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -2634,7 +2634,7 @@ cat = SC_BASIC
var = gui.window_snap_radius
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
def = 10
min = 1
max = 32
@@ -2647,7 +2647,7 @@ cat = SC_EXPERT
var = gui.window_soft_limit
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED
+guiflags = SF_GUI_0_IS_SPECIAL
def = 20
min = 5
max = 255
@@ -2661,7 +2661,7 @@ cat = SC_EXPERT
var = gui.zoom_min
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = ZOOM_LVL_MIN
min = ZOOM_LVL_MIN
max = ZOOM_LVL_OUT_4X
@@ -2675,7 +2675,7 @@ startup = true
var = gui.zoom_max
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = ZOOM_LVL_MAX
min = ZOOM_LVL_OUT_8X
max = ZOOM_LVL_MAX
@@ -2689,7 +2689,7 @@ startup = true
var = gui.sprite_zoom_min
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = ZOOM_LVL_MIN
min = ZOOM_LVL_MIN
max = ZOOM_LVL_OUT_4X
@@ -2717,7 +2717,7 @@ strhelp = STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR_HELPTEXT
var = gui.smallmap_land_colour
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -2730,7 +2730,7 @@ post_cb = RedrawSmallmap
var = gui.liveries
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 2
@@ -2743,7 +2743,7 @@ post_cb = InvalidateCompanyLiveryWindow
var = gui.starting_colour
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = COLOUR_END
min = 0
max = COLOUR_END
@@ -2771,7 +2771,7 @@ cat = SC_BASIC
var = gui.scrollwheel_scrolling
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -2805,7 +2805,7 @@ cat = SC_BASIC
var = gui.advanced_vehicle_list
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -2842,7 +2842,7 @@ cat = SC_BASIC
var = gui.loading_indicators
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -2856,7 +2856,7 @@ cat = SC_BASIC
var = gui.default_rail_type
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
min = 0
max = 2
@@ -2933,7 +2933,7 @@ cat = SC_BASIC
var = gui.order_review_system
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 2
@@ -2961,7 +2961,7 @@ cat = SC_BASIC
var = gui.stop_location
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 2
@@ -3022,7 +3022,7 @@ cat = SC_BASIC
var = gui.default_signal_type
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 2
@@ -3036,7 +3036,7 @@ cat = SC_BASIC
var = gui.cycle_signal_types
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
min = 0
max = 2
@@ -3207,7 +3207,7 @@ cat = SC_EXPERT
var = gui.newgrf_default_palette
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
min = 0
max = 1
@@ -3244,7 +3244,7 @@ startup = true
var = gui.fast_forward_speed_limit
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED | SGF_NO_NETWORK
+guiflags = SF_GUI_0_IS_SPECIAL | SF_NO_NETWORK
def = 2500
min = 0
max = 50000
@@ -3370,7 +3370,7 @@ cat = SC_BASIC
var = news_display.arrival_player
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3382,7 +3382,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.arrival_other
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _news_display
@@ -3394,7 +3394,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.accident
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3406,7 +3406,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.company_info
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3418,7 +3418,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.open
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _news_display
@@ -3430,7 +3430,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.close
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _news_display
@@ -3442,7 +3442,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.economy
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3454,7 +3454,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.production_player
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _news_display
@@ -3466,7 +3466,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.production_other
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
max = 2
full = _news_display
@@ -3478,7 +3478,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.production_nobody
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 0
max = 2
full = _news_display
@@ -3490,7 +3490,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.advice
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3502,7 +3502,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.new_vehicles
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3514,7 +3514,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.acceptance
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3526,7 +3526,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.subsidies
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 1
max = 2
full = _news_display
@@ -3538,7 +3538,7 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
var = news_display.general
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_MULTISTRING
+guiflags = SF_GUI_DROPDOWN
def = 2
max = 2
full = _news_display
@@ -3577,7 +3577,7 @@ cat = SC_EXPERT
var = network.sync_freq
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 100
min = 0
max = 100
@@ -3587,7 +3587,7 @@ cat = SC_EXPERT
var = network.frame_freq
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 0
min = 0
max = 100
@@ -3597,7 +3597,7 @@ cat = SC_EXPERT
var = network.commands_per_frame
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 2
min = 1
max = 65535
@@ -3607,7 +3607,7 @@ cat = SC_EXPERT
var = network.max_commands_in_queue
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 16
min = 1
max = 65535
@@ -3617,7 +3617,7 @@ cat = SC_EXPERT
var = network.bytes_per_frame
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 8
min = 1
max = 65535
@@ -3627,7 +3627,7 @@ cat = SC_EXPERT
var = network.bytes_per_frame_burst
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 256
min = 1
max = 65535
@@ -3637,7 +3637,7 @@ cat = SC_EXPERT
var = network.max_init_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 100
min = 0
max = 32000
@@ -3647,7 +3647,7 @@ cat = SC_EXPERT
var = network.max_join_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 500
min = 0
max = 32000
@@ -3656,7 +3656,7 @@ max = 32000
var = network.max_download_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 1000
min = 0
max = 32000
@@ -3665,7 +3665,7 @@ max = 32000
var = network.max_password_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 2000
min = 0
max = 32000
@@ -3674,7 +3674,7 @@ max = 32000
var = network.max_lag_time
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 500
min = 0
max = 32000
@@ -3682,14 +3682,14 @@ max = 32000
[SDTC_BOOL]
var = network.pause_on_join
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = true
[SDTC_VAR]
var = network.server_port
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = NETWORK_DEFAULT_PORT
min = 0
max = 65535
@@ -3699,7 +3699,7 @@ cat = SC_EXPERT
var = network.server_admin_port
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = NETWORK_ADMIN_PORT
min = 0
max = 65535
@@ -3708,14 +3708,14 @@ cat = SC_EXPERT
[SDTC_BOOL]
var = network.server_admin_chat
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = true
cat = SC_EXPERT
[SDTC_BOOL]
var = network.server_advertise
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = false
[SDTC_SSTR]
@@ -3733,7 +3733,7 @@ var = network.server_password
type = SLE_STR
length = NETWORK_PASSWORD_LENGTH
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = nullptr
pre_cb = ReplaceAsteriskWithEmptyPassword
post_cb = [](auto) { NetworkServerUpdateGameInfo(); }
@@ -3744,7 +3744,7 @@ var = network.rcon_password
type = SLE_STR
length = NETWORK_PASSWORD_LENGTH
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = nullptr
pre_cb = ReplaceAsteriskWithEmptyPassword
cat = SC_BASIC
@@ -3754,7 +3754,7 @@ var = network.admin_password
type = SLE_STR
length = NETWORK_PASSWORD_LENGTH
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = nullptr
cat = SC_BASIC
@@ -3770,7 +3770,7 @@ var = network.server_name
type = SLE_STR
length = NETWORK_NAME_LENGTH
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = nullptr
pre_cb = NetworkValidateServerName
post_cb = [](auto) { UpdateClientConfigValues(); }
@@ -3788,20 +3788,20 @@ var = network.network_id
type = SLE_STR
length = NETWORK_SERVER_ID_LENGTH
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = nullptr
[SDTC_BOOL]
var = network.autoclean_companies
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = false
[SDTC_VAR]
var = network.autoclean_unprotected
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
+guiflags = SF_GUI_0_IS_SPECIAL | SF_NETWORK_ONLY
def = 12
min = 0
max = 240
@@ -3810,7 +3810,7 @@ max = 240
var = network.autoclean_protected
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
+guiflags = SF_GUI_0_IS_SPECIAL | SF_NETWORK_ONLY
def = 36
min = 0
max = 240
@@ -3819,7 +3819,7 @@ max = 240
var = network.autoclean_novehicles
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
+guiflags = SF_GUI_0_IS_SPECIAL | SF_NETWORK_ONLY
def = 0
min = 0
max = 240
@@ -3828,7 +3828,7 @@ max = 240
var = network.max_companies
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 15
min = 1
max = MAX_COMPANIES
@@ -3839,7 +3839,7 @@ cat = SC_BASIC
var = network.max_clients
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 25
min = 2
max = MAX_CLIENTS
@@ -3850,7 +3850,7 @@ cat = SC_BASIC
var = network.max_spectators
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 15
min = 0
max = MAX_CLIENTS
@@ -3861,7 +3861,7 @@ cat = SC_BASIC
var = network.restart_game_year
type = SLE_INT32
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
+guiflags = SF_GUI_0_IS_SPECIAL | SF_NETWORK_ONLY
def = 0
min = MIN_YEAR
max = MAX_YEAR
@@ -3871,7 +3871,7 @@ interval = 1
var = network.min_active_clients
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = 0
min = 0
max = MAX_CLIENTS
@@ -3879,7 +3879,7 @@ max = MAX_CLIENTS
[SDTC_BOOL]
var = network.reload_cfg
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
+guiflags = SF_NETWORK_ONLY
def = false
cat = SC_EXPERT
diff --git a/src/table/settings/win32_settings.ini b/src/table/settings/win32_settings.ini
index 7a3fb9a5c..32a5cf5c9 100644
--- a/src/table/settings/win32_settings.ini
+++ b/src/table/settings/win32_settings.ini
@@ -25,7 +25,7 @@ SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds stor
[defaults]
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
diff --git a/src/table/settings/window_settings.ini b/src/table/settings/window_settings.ini
index 17596a4d5..f9301ef2c 100644
--- a/src/table/settings/window_settings.ini
+++ b/src/table/settings/window_settings.ini
@@ -21,7 +21,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for WindowDesc.$var ex
[defaults]
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
interval = 0
str = STR_NULL
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT