cpp/openttd-patchpack/source Changeset - r17435:5574ebefe58a

Changeset - r17435:5574ebefe58a

Parent rev.

Child rev.

[Not reviewed]

master

0 9 0

rubidium - 13 years ago 2011-03-05 11:34:31
rubidium@openttd.org

(svn r22199) -Cleanup-ish: replace the shortcut macros for (gui)flags with their more clearly named (longer) constant names

9 files changed with 248 insertions and 325 deletions:

src/table/company_settings.ini

src/table/currency_settings.ini

src/table/gameopt_settings.ini

src/table/misc_settings.ini

src/table/music_settings.ini

src/table/settings.h.postamble

src/table/settings.h.preamble

src/table/settings.ini

233

src/table/win32_settings.ini

0 comments (0 inline, 0 general)

src/table/company_settings.ini

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ SDT_END = SDT_END() @@
 [defaults]
 flags    = 0
-guiflags = 0
+guiflags = SGF_PER_COMPANY
 interval = 0
 str      = STR_NULL
 proc     = NULL
@@ @@ -22,7 +22,6 @@ to = SL_MAX_VERSION @@
 [SDT_BOOL]
 base     = CompanySettings
 var      = engine_renew
 guiflags = PC
 def      = false
 str      = STR_CONFIG_SETTING_AUTORENEW_VEHICLE
@@ @@ -30,7 +29,6 @@ str = STR_CONFIG_SETTING_AUTORENEW_ @@
 base     = CompanySettings
 var      = engine_renew_months
 type     = SLE_INT16
 guiflags = PC
 def      = 6
 min      = -12
 max      = 12
@@ @@ -40,7 +38,7 @@ str = STR_CONFIG_SETTING_AUTORENEW_ @@
 base     = CompanySettings
 var      = engine_renew_money
 type     = SLE_UINT
-guiflags = PC|CR
+guiflags = SGF_PER_COMPANY | SGF_CURRENCY
 def      = 100000
 min      = 0
 max      = 2000000
@@ @@ -49,13 +47,11 @@ str = STR_CONFIG_SETTING_AUTORENEW_ @@
 [SDT_BOOL]
 base     = CompanySettings
 var      = renew_keep_length
 guiflags = PC
 def      = false
 [SDT_BOOL]
 base     = CompanySettings
 var      = vehicle.servint_ispercent
 guiflags = PC
 def      = false
 str      = STR_CONFIG_SETTING_SERVINT_ISPERCENT
 proc     = CheckInterval
@@ @@ -64,7 +60,7 @@ proc = CheckInterval @@
 base     = CompanySettings
 var      = vehicle.servint_trains
 type     = SLE_UINT16
-guiflags = PC|D0
+guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
 def      = 150
 min      = 5
 max      = 800
@@ @@ -75,7 +71,7 @@ proc = InvalidateDetailsWindow @@
 base     = CompanySettings
 var      = vehicle.servint_roadveh
 type     = SLE_UINT16
-guiflags = PC|D0
+guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
 def      = 150
 min      = 5
 max      = 800
@@ @@ -86,7 +82,7 @@ proc = InvalidateDetailsWindow @@
 base     = CompanySettings
 var      = vehicle.servint_ships
 type     = SLE_UINT16
-guiflags = PC|D0
+guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
 def      = 360
 min      = 5
 max      = 800
@@ @@ -97,7 +93,7 @@ proc = InvalidateDetailsWindow @@
 base     = CompanySettings
 var      = vehicle.servint_aircraft
 type     = SLE_UINT16
-guiflags = PC|D0
+guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
 def      = 100
 min      = 5
 max      = 800

src/table/currency_settings.ini

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ SDT_STR = SDT_STR($base, $var, $type, $f @@
 SDT_END = SDT_END()
 [defaults]
-flags    = 0
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = 0
 interval = 0
 str      = STR_NULL
@@ @@ -24,7 +24,6 @@ to = SL_MAX_VERSION @@
 base     = CurrencySpec
 var      = rate
 type     = SLE_UINT16
 flags    = S
 def      = 1
 min      = 0
 max      = UINT16_MAX
@@ @@ -32,14 +31,12 @@ max = UINT16_MAX @@
 [SDT_CHR]
 base     = CurrencySpec
 var      = separator
 flags    = S
 def      = "".""
 [SDT_VAR]
 base     = CurrencySpec
 var      = to_euro
 type     = SLE_INT32
 flags    = S
 def      = 0
 min      = MIN_YEAR
 max      = MAX_YEAR
@@ @@ -48,14 +45,12 @@ max = MAX_YEAR @@
 base     = CurrencySpec
 var      = prefix
 type     = SLE_STRBQ
 flags    = S
 def      = NULL
 [SDT_STR]
 base     = CurrencySpec
 var      = suffix
 type     = SLE_STRBQ
 flags    = S
 def      = "" credits""
 [SDT_END]

src/table/gameopt_settings.ini

➞

Show inline comments

@@ @@ -52,7 +52,7 @@ name = ""diff_custom"" @@
 sdt_cmd  = SDT_INTLIST
 sle_cmd  = SL_ARR
 type     = SLE_FILE_I16 | SLE_VAR_U16
-flags    = C
+flags    = SLF_NOT_IN_CONFIG
 var      = _old_diff_custom
 length   = 17
 def      = 0
@@ @@ -66,7 +66,7 @@ name = ""diff_custom"" @@
 sdt_cmd  = SDT_INTLIST
 sle_cmd  = SL_ARR
 type     = SLE_UINT16
-flags    = C
+flags    = SLF_NOT_IN_CONFIG
 var      = _old_diff_custom
 length   = 18
 def      = 0
@@ @@ -88,7 +88,7 @@ max = 3 @@
 base     = GameSettings
 var      = locale.currency
 type     = SLE_UINT8
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = 0
 max      = CUSTOM_CURRENCY_ID
 full     = _locale_currencies
@@ @@ -97,7 +97,7 @@ full = _locale_currencies @@
 base     = GameSettings
 var      = locale.units
 type     = SLE_UINT8
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = 1
 max      = 2
 full     = _locale_units
@@ @@ -137,7 +137,7 @@ to = 22 @@
 var      = gui.autosave
 type     = SLE_UINT8
 from     = 23
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 1
 max      = 4
 full     = _autosave_interval

src/table/misc_settings.ini

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ SDTG_VAR = SDTG_VAR($name, $type, @@
 SDTG_END   = SDTG_END()
 [defaults]
-flags    = 0
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = 0
 interval = 0
 str      = STR_NULL
@@ @@ -27,76 +27,65 @@ to = SL_MAX_VERSION @@
 [SDTG_MMANY]
 name     = ""display_opt""
 type     = SLE_UINT8
 flags    = S
 var      = _display_opt
 def      = (1 << DO_SHOW_TOWN_NAMES | 1 << DO_SHOW_STATION_NAMES | 1 << DO_SHOW_SIGNS | 1 << DO_FULL_ANIMATION | 1 << DO_FULL_DETAIL | 1 << DO_SHOW_WAYPOINT_NAMES)
 full     = ""SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION||FULL_DETAIL|WAYPOINTS""
 [SDTG_BOOL]
 name     = ""news_ticker_sound""
 flags    = S
 var      = _news_ticker_sound
 def      = true
 [SDTG_BOOL]
 name     = ""fullscreen""
 flags    = S
 var      = _fullscreen
 def      = false
 [SDTG_STR]
 name     = ""graphicsset""
 type     = SLE_STRQ
 flags    = S
 var      = BaseGraphics::ini_set
 def      = NULL
 [SDTG_STR]
 name     = ""soundsset""
 type     = SLE_STRQ
 flags    = S
 var      = BaseSounds::ini_set
 def      = NULL
 [SDTG_STR]
 name     = ""musicset""
 type     = SLE_STRQ
 flags    = S
 var      = BaseMusic::ini_set
 def      = NULL
 [SDTG_STR]
 name     = ""videodriver""
 type     = SLE_STRQ
 flags    = S
 var      = _ini_videodriver
 def      = NULL
 [SDTG_STR]
 name     = ""musicdriver""
 type     = SLE_STRQ
 flags    = S
 var      = _ini_musicdriver
 def      = NULL
 [SDTG_STR]
 name     = ""sounddriver""
 type     = SLE_STRQ
 flags    = S
 var      = _ini_sounddriver
 def      = NULL
 [SDTG_STR]
 name     = ""blitter""
 type     = SLE_STRQ
 flags    = S
 var      = _ini_blitter
 def      = NULL
 [SDTG_STR]
 name     = ""language""
 type     = SLE_STRB
 flags    = S
 var      = _config_language_file
 def      = NULL
@@ @@ -105,27 +94,23 @@ def = NULL @@
 name     = ""resolution""
 type     = SLE_INT
 length   = 2
 flags    = S
 var      = _cur_resolution
 def      = ""640,480""
 [SDTG_STR]
 name     = ""screenshot_format""
 type     = SLE_STRB
 flags    = S
 var      = _screenshot_format_name
 def      = NULL
 [SDTG_STR]
 name     = ""savegame_format""
 type     = SLE_STRB
 flags    = S
 var      = _savegame_format
 def      = NULL
 [SDTG_BOOL]
 name     = ""rightclick_emulate""
 flags    = S
 var      = _rightclick_emulate
 def      = false
@@ @@ -133,7 +118,6 @@ def = false @@
 ifdef    = WITH_FREETYPE
 name     = ""small_font""
 type     = SLE_STRB
 flags    = S
 var      = _freetype.small_font
 def      = NULL
@@ @@ -141,7 +125,6 @@ def = NULL @@
 ifdef    = WITH_FREETYPE
 name     = ""medium_font""
 type     = SLE_STRB
 flags    = S
 var      = _freetype.medium_font
 def      = NULL
@@ @@ -149,7 +132,6 @@ def = NULL @@
 ifdef    = WITH_FREETYPE
 name     = ""large_font""
 type     = SLE_STRB
 flags    = S
 var      = _freetype.large_font
 def      = NULL
@@ @@ -157,7 +139,6 @@ def = NULL @@
 ifdef    = WITH_FREETYPE
 name     = ""small_size""
 type     = SLE_UINT
 flags    = S
 var      = _freetype.small_size
 def      = 8
 min      = 0
@@ @@ -167,7 +148,6 @@ max = 72 @@
 ifdef    = WITH_FREETYPE
 name     = ""medium_size""
 type     = SLE_UINT
 flags    = S
 var      = _freetype.medium_size
 def      = 10
 min      = 0
@@ @@ -177,7 +157,6 @@ max = 72 @@
 ifdef    = WITH_FREETYPE
 name     = ""large_size""
 type     = SLE_UINT
 flags    = S
 var      = _freetype.large_size
 def      = 16
 min      = 0
@@ @@ -186,28 +165,24 @@ max = 72 @@
 [SDTG_BOOL]
 ifdef    = WITH_FREETYPE
 name     = ""small_aa""
 flags    = S
 var      = _freetype.small_aa
 def      = false
 [SDTG_BOOL]
 ifdef    = WITH_FREETYPE
 name     = ""medium_aa""
 flags    = S
 var      = _freetype.medium_aa
 def      = false
 [SDTG_BOOL]
 ifdef    = WITH_FREETYPE
 name     = ""large_aa""
 flags    = S
 var      = _freetype.large_aa
 def      = false
 [SDTG_VAR]
 name     = ""sprite_cache_size""
 type     = SLE_UINT
 flags    = S
 var      = _sprite_cache_size
 def      = 4
 min      = 1
@@ @@ -216,7 +191,6 @@ max = 64 @@
 [SDTG_VAR]
 name     = ""player_face""
 type     = SLE_UINT32
 flags    = S
 var      = _company_manager_face
 def      = 0
 min      = 0
@@ @@ -225,7 +199,6 @@ max = 0xFFFFFFFF @@
 [SDTG_VAR]
 name     = ""transparency_options""
 type     = SLE_UINT
 flags    = S
 var      = _transparency_opt
 def      = 0
 min      = 0
@@ @@ -234,7 +207,6 @@ max = 0x1FF @@
 [SDTG_VAR]
 name     = ""transparency_locks""
 type     = SLE_UINT
 flags    = S
 var      = _transparency_lock
 def      = 0
 min      = 0
@@ @@ -243,7 +215,6 @@ max = 0x1FF @@
 [SDTG_VAR]
 name     = ""invisibility_options""
 type     = SLE_UINT
 flags    = S
 var      = _invisibility_opt
 def      = 0
 min      = 0
@@ @@ -252,14 +223,12 @@ max = 0xFF @@
 [SDTG_STR]
 name     = ""keyboard""
 type     = SLE_STRB
 flags    = S
 var      = _keyboard_opt[0]
 def      = NULL
 [SDTG_STR]
 name     = ""keyboard_caps""
 type     = SLE_STRB
 flags    = S
 var      = _keyboard_opt[1]
 def      = NULL

src/table/music_settings.ini

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ SDT_LIST = SDT_LIST($base, $var, $type, @@
 SDT_END  = SDT_END()
 [defaults]
-flags    = 0
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = 0
 interval = 0
 str      = STR_NULL
@@ @@ -24,7 +24,6 @@ to = SL_MAX_VERSION @@
 base     = MusicFileSettings
 var      = playlist
 type     = SLE_UINT8
 flags    = S
 def      = 0
 min      = 0
 max      = 5
@@ @@ -34,7 +33,6 @@ interval = 1 @@
 base     = MusicFileSettings
 var      = music_vol
 type     = SLE_UINT8
 flags    = S
 def      = 127
 min      = 0
 max      = 127
@@ @@ -44,7 +42,6 @@ interval = 1 @@
 base     = MusicFileSettings
 var      = effect_vol
 type     = SLE_UINT8
 flags    = S
 def      = 127
 min      = 0
 max      = 127
@@ @@ -54,26 +51,22 @@ interval = 1 @@
 base     = MusicFileSettings
 var      = custom_1
 type     = SLE_UINT8
 flags    = S
 def      = NULL
 [SDT_LIST]
 base     = MusicFileSettings
 var      = custom_2
 type     = SLE_UINT8
 flags    = S
 def      = NULL
 [SDT_BOOL]
 base     = MusicFileSettings
 var      = playing
 flags    = S
 def      = true
 [SDT_BOOL]
 base     = MusicFileSettings
 var      = shuffle
 flags    = S
 def      = false
 [SDT_END]

src/table/settings.h.postamble

➞

Show inline comments

 /* Undefine for the shortcut macros above */
 #undef S
 #undef C
 #undef N
 #undef D0
 #undef NC
 #undef MS
 #undef NO
 #undef CR

src/table/settings.h.preamble

➞

Show inline comments

@@ @@ -164,19 +164,3 @@ static bool UpdateClientConfigValues(int @@
 #define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, NULL, NULL}, SLE_END()}
 /* Shortcuts for macros below. Logically if we don't save the value
  * we also don't sync it in a network game */
 #define S SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 #define C SLF_NOT_IN_CONFIG
 #define N SLF_NO_NETWORK_SYNC
 #define D0 SGF_0ISDISABLED
 #define NC SGF_NOCOMMA
 #define MS SGF_MULTISTRING
 #define NO SGF_NETWORK_ONLY
 #define CR SGF_CURRENCY
 #define NN SGF_NO_NETWORK
 #define NG SGF_NEWGAME_ONLY
 #define NS SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 #define PC SGF_PER_COMPANY

src/table/settings.ini

➞

Show inline comments

@@ @@ -48,7 +48,7 @@ type = SLE_UINT8 @@
 from     = 97
 def      = 0
 min      = 0
 max      = MAX_COMPANIES-1
+max      = MAX_COMPANIES - 1
 interval = 1
 proc     = MaxNoAIsChange
@@ @@ -62,7 +62,7 @@ base = GameSettings @@
 var      = difficulty.number_towns
 type     = SLE_UINT8
 from     = 97
-guiflags = NG
+guiflags = SGF_NEWGAME_ONLY
 def      = 2
 min      = 0
 max      = 4
@@ @@ -75,10 +75,10 @@ base = GameSettings @@
 var      = difficulty.industry_density
 type     = SLE_UINT8
 from     = 97
 guiflags = NG
 def      = ID_END-1
 guiflags = SGF_NEWGAME_ONLY
 def      = ID_END - 1
 min      = 0
 max      = ID_END-1
+max      = ID_END - 1
 interval = 1
 str      = STR_FUNDING_ONLY
 proc     = DifficultyChange
@@ @@ -88,7 +88,7 @@ base = GameSettings @@
 var      = difficulty.max_loan
 type     = SLE_UINT32
 from     = 97
-guiflags = NS|CR
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_CURRENCY
 def      = 300000
 min      = 100000
 max      = 500000
@@ @@ -100,7 +100,7 @@ base = GameSettings @@
 var      = difficulty.initial_interest
 type     = SLE_UINT8
 from     = 97
-guiflags = NS
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = 2
 min      = 2
 max      = 4
@@ @@ -112,7 +112,7 @@ base = GameSettings @@
 var      = difficulty.vehicle_costs
 type     = SLE_UINT8
 from     = 97
-guiflags = NS
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = 0
 min      = 0
 max      = 2
@@ @@ -166,7 +166,7 @@ base = GameSettings @@
 var      = difficulty.construction_cost
 type     = SLE_UINT8
 from     = 97
-guiflags = NS
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = 0
 min      = 0
 max      = 2
@@ @@ -179,7 +179,7 @@ base = GameSettings @@
 var      = difficulty.terrain_type
 type     = SLE_UINT8
 from     = 97
-guiflags = NG
+guiflags = SGF_NEWGAME_ONLY
 def      = 1
 min      = 0
 max      = 3
@@ @@ -192,7 +192,7 @@ base = GameSettings @@
 var      = difficulty.quantity_sea_lakes
 type     = SLE_UINT8
 from     = 97
-guiflags = NG
+guiflags = SGF_NEWGAME_ONLY
 def      = 0
 min      = 0
 max      = 4
@@ @@ -265,7 +265,7 @@ base = GameSettings @@
 var      = game_creation.town_name
 type     = SLE_UINT8
 from     = 97
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 0
 max      = 255
 full     = _town_names
@@ @@ -275,7 +275,7 @@ base = GameSettings @@
 var      = game_creation.landscape
 type     = SLE_UINT8
 from     = 97
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 0
 max      = 3
 full     = _climates
@@ @@ -286,7 +286,7 @@ base = GameSettings @@
 var      = game_creation.snow_line
 type     = SLE_UINT8
 from     = 97
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT
 min      = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
 max      = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
@@ @@ -296,7 +296,7 @@ base = GameSettings @@
 var      = vehicle.road_side
 type     = SLE_UINT8
 from     = 97
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 1
 max      = 1
 full     = _roadsides
@@ @@ -307,7 +307,7 @@ proc = CheckRoadSide @@
 [SDT_BOOL]
 base     = GameSettings
 var      = construction.build_on_slopes
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_BUILDONSLOPES
@@ @@ -316,7 +316,7 @@ base = GameSettings @@
 var      = construction.command_pause_level
 type     = SLE_UINT8
 from     = 154
-guiflags = MS|NN
+guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
 def      = 1
 min      = 0
 max      = 3
@@ @@ -381,7 +381,7 @@ base = GameSettings @@
 var      = construction.max_bridge_length
 type     = SLE_UINT16
 from     = 159
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 64
 min      = 1
 max      = 2048
@@ @@ -393,7 +393,7 @@ base = GameSettings @@
 var      = construction.max_tunnel_length
 type     = SLE_UINT16
 from     = 159
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 64
 min      = 1
 max      = 2048
@@ @@ -408,8 +408,8 @@ to = 158 @@
 [SDT_BOOL]
 base     = GameSettings
 var      = construction.signal_side
 flags    = N
 guiflags = NN
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_SIGNALSIDE
 proc     = RedrawScreen
@@ @@ -417,7 +417,7 @@ proc = RedrawScreen @@
 [SDT_BOOL]
 base     = GameSettings
 var      = station.never_expire_airports
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = false
 str      = STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS
@@ @@ -426,7 +426,7 @@ base = GameSettings @@
 var      = economy.town_layout
 type     = SLE_UINT8
 from     = 59
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = TL_ORIGINAL
 min      = TL_BEGIN
 max      = NUM_TLS - 1
@@ @@ -438,7 +438,7 @@ proc = TownFoundingChanged @@
 base     = GameSettings
 var      = economy.allow_town_roads
 from     = 113
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS
@@ @@ -447,7 +447,7 @@ base = GameSettings @@
 var      = economy.found_town
 type     = SLE_UINT8
 from     = 128
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = TF_FORBIDDEN
 min      = TF_BEGIN
 max      = TF_END - 1
@@ @@ -459,7 +459,7 @@ proc = TownFoundingChanged @@
 base     = GameSettings
 var      = economy.allow_town_level_crossings
 from     = 143
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
@@ @@ -469,7 +469,7 @@ str = STR_CONFIG_SETTING_ALLOW_TOWN @@
 base     = GameSettings
 var      = vehicle.train_acceleration_model
 type     = SLE_UINT8
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 1
@@ @@ -482,7 +482,7 @@ base = GameSettings @@
 var      = vehicle.roadveh_acceleration_model
 type     = SLE_UINT8
 from     = 139
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 1
@@ @@ -541,7 +541,7 @@ base = GameSettings @@
 var      = vehicle.smoke_amount
 type     = SLE_UINT8
 from     = 145
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
@@ @@ -593,7 +593,7 @@ base = GameSettings @@
 var      = pf.pathfinder_for_trains
 type     = SLE_UINT8
 from     = 87
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 1
 max      = 2
@@ @@ -605,7 +605,7 @@ base = GameSettings @@
 var      = pf.pathfinder_for_roadvehs
 type     = SLE_UINT8
 from     = 87
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 1
 max      = 2
@@ @@ -617,7 +617,7 @@ base = GameSettings @@
 var      = pf.pathfinder_for_ships
 type     = SLE_UINT8
 from     = 87
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
@@ @@ -627,7 +627,7 @@ str = STR_CONFIG_SETTING_PATHFINDER @@
 [SDT_BOOL]
 base     = GameSettings
 var      = vehicle.never_expire_vehicles
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = false
 str      = STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES
@@ @@ -673,7 +673,7 @@ proc = RedrawScreen @@
 [SDTG_BOOL]
 name     = NULL
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 var      = _old_vds.servint_ispercent
 def      = false
 to       = 119
@@ @@ -681,7 +681,7 @@ to = 119 @@
 [SDTG_VAR]
 name     = NULL
 type     = SLE_UINT16
-guiflags = D0
+guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_trains
 def      = 150
 min      = 5
@@ @@ -691,7 +691,7 @@ to = 119 @@
 [SDTG_VAR]
 name     = NULL
 type     = SLE_UINT16
-guiflags = D0
+guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_roadveh
 def      = 150
 min      = 5
@@ @@ -701,7 +701,7 @@ to = 119 @@
 [SDTG_VAR]
 name     = NULL
 type     = SLE_UINT16
-guiflags = D0
+guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_ships
 def      = 360
 min      = 5
@@ @@ -711,7 +711,7 @@ to = 119 @@
 [SDTG_VAR]
 name     = NULL
 type     = SLE_UINT16
-guiflags = D0
+guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_aircraft
 def      = 150
 min      = 5
@@ @@ -727,7 +727,7 @@ str = STR_CONFIG_SETTING_NOSERVICE @@
 [SDT_BOOL]
 base     = GameSettings
 var      = vehicle.wagon_speed_limits
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_WAGONSPEEDLIMITS
 proc     = UpdateConsists
@@ @@ -736,7 +736,7 @@ proc = UpdateConsists @@
 base     = GameSettings
 var      = vehicle.disable_elrails
 from     = 38
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = false
 str      = STR_CONFIG_SETTING_DISABLE_ELRAILS
 proc     = SettingsDisableElrail
@@ @@ -746,7 +746,7 @@ base = GameSettings @@
 var      = vehicle.freight_trains
 type     = SLE_UINT8
 from     = 39
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 1
 min      = 1
 max      = 255
@@ @@ -765,7 +765,7 @@ base = GameSettings @@
 var      = vehicle.plane_speed
 type     = SLE_UINT8
 from     = 90
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = 4
 min      = 1
 max      = 4
@@ @@ -775,7 +775,7 @@ str = STR_CONFIG_SETTING_PLANE_SPEE @@
 base     = GameSettings
 var      = vehicle.dynamic_engines
 from     = 95
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_DYNAMIC_ENGINES
 proc     = ChangeDynamicEngines
@@ @@ -785,7 +785,7 @@ base = GameSettings @@
 var      = vehicle.plane_crashes
 type     = SLE_UINT8
 from     = 138
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -806,7 +806,7 @@ def = true @@
 [SDT_BOOL]
 base     = GameSettings
 var      = order.improved_load
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_IMPROVEDLOAD
@@ @@ -854,7 +854,7 @@ proc = StationCatchmentChanged @@
 base     = GameSettings
 var      = order.gradual_loading
 from     = 40
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_GRADUAL_LOADING
@@ @@ -883,7 +883,7 @@ str = STR_CONFIG_SETTING_ADJACENT_S @@
 base     = GameSettings
 var      = economy.station_noise_level
 from     = 96
-guiflags = NN
+guiflags = SGF_NO_NETWORK
 def      = false
 str      = STR_CONFIG_SETTING_NOISE_LEVEL
 proc     = InvalidateTownViewWindow
@@ @@ -907,7 +907,7 @@ str = STR_CONFIG_SETTING_INFLATION @@
 base     = GameSettings
 var      = construction.raw_industry_construction
 type     = SLE_UINT8
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
@@ @@ -981,7 +981,7 @@ to = 143 @@
 base     = GameSettings
 var      = game_creation.starting_year
 type     = SLE_INT32
-guiflags = NC
+guiflags = SGF_NOCOMMA
 def      = DEF_START_YEAR
 min      = MIN_YEAR
 max      = MAX_YEAR
@@ @@ -1020,7 +1020,7 @@ base = GameSettings @@
 var      = economy.town_growth_rate
 type     = SLE_UINT8
 from     = 54
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 4
@@ @@ -1031,7 +1031,7 @@ base = GameSettings @@
 var      = economy.larger_towns
 type     = SLE_UINT8
 from     = 54
-guiflags = D0
+guiflags = SGF_0ISDISABLED
 def      = 4
 min      = 0
 max      = 255
@@ @@ -1096,7 +1096,7 @@ base = GameSettings @@
 var      = ai.ai_max_opcode_till_suspend
 type     = SLE_UINT32
 from     = 107
-guiflags = NG
+guiflags = SGF_NEWGAME_ONLY
 def      = 10000
 min      = 5000
 max      = 250000
@@ @@ -1225,7 +1225,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_firstred_penalty
 type     = SLE_UINT
-def      = ( 10 * NPF_TILE_LENGTH)
 def      = 10 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1233,7 +1233,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_firstred_exit_penalty
 type     = SLE_UINT
-def      = (100 * NPF_TILE_LENGTH)
 def      = 100 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1241,7 +1241,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_lastred_penalty
 type     = SLE_UINT
-def      = ( 10 * NPF_TILE_LENGTH)
 def      = 10 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1249,7 +1249,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_station_penalty
 type     = SLE_UINT
-def      = (  1 * NPF_TILE_LENGTH)
 def      = 1 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1257,7 +1257,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_slope_penalty
 type     = SLE_UINT
-def      = (  1 * NPF_TILE_LENGTH)
 def      = 1 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1265,7 +1265,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_curve_penalty
 type     = SLE_UINT
-def      = (  1 * NPF_TILE_LENGTH)
 def      = 1 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1273,7 +1273,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_rail_depot_reverse_penalty
 type     = SLE_UINT
-def      = ( 50 * NPF_TILE_LENGTH)
 def      = 50 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1282,7 +1282,7 @@ base = GameSettings @@
 var      = pf.npf.npf_rail_pbs_cross_penalty
 type     = SLE_UINT
 from     = 100
-def      = (  3 * NPF_TILE_LENGTH)
 def      = 3 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1291,7 +1291,7 @@ base = GameSettings @@
 var      = pf.npf.npf_rail_pbs_signal_back_penalty
 type     = SLE_UINT
 from     = 100
-def      = ( 15 * NPF_TILE_LENGTH)
 def      = 15 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1299,7 +1299,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_buoy_penalty
 type     = SLE_UINT
-def      = (  2 * NPF_TILE_LENGTH)
 def      = 2 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1307,7 +1307,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_water_curve_penalty
 type     = SLE_UINT
-def      = (  1 * NPF_TILE_LENGTH)
 def      = 1 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1315,7 +1315,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_road_curve_penalty
 type     = SLE_UINT
-def      = (  1 * NPF_TILE_LENGTH)
 def      = 1 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1323,7 +1323,7 @@ max = 100000 @@
 base     = GameSettings
 var      = pf.npf.npf_crossing_penalty
 type     = SLE_UINT
-def      = (  3 * NPF_TILE_LENGTH)
 def      = 3 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1332,7 +1332,7 @@ base = GameSettings @@
 var      = pf.npf.npf_road_drive_through_penalty
 type     = SLE_UINT
 from     = 47
-def      = (  8 * NPF_TILE_LENGTH)
 def      = 8 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1341,7 +1341,7 @@ base = GameSettings @@
 var      = pf.npf.npf_road_dt_occupied_penalty
 type     = SLE_UINT
 from     = 130
-def      = (  8 * NPF_TILE_LENGTH)
 def      = 8 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1350,7 +1350,7 @@ base = GameSettings @@
 var      = pf.npf.npf_road_bay_occupied_penalty
 type     = SLE_UINT
 from     = 130
-def      = ( 15 * NPF_TILE_LENGTH)
 def      = 15 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ @@ -1359,7 +1359,7 @@ base = GameSettings @@
 var      = pf.npf.maximum_go_to_depot_penalty
 type     = SLE_UINT
 from     = 131
-def      = ( 20 * NPF_TILE_LENGTH)
 def      = 20 * NPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ @@ -1652,7 +1652,7 @@ base = GameSettings @@
 var      = game_creation.land_generator
 type     = SLE_UINT8
 from     = 30
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 1
@@ @@ -1673,7 +1673,7 @@ base = GameSettings @@
 var      = game_creation.tgen_smoothness
 type     = SLE_UINT8
 from     = 30
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 3
@@ @@ -1683,7 +1683,7 @@ str = STR_CONFIG_SETTING_ROUGHNESS_ @@
 base     = GameSettings
 var      = game_creation.variety
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 0
 min      = 0
 max      = 5
@@ @@ -1702,7 +1702,7 @@ base = GameSettings @@
 var      = game_creation.tree_placer
 type     = SLE_UINT8
 from     = 30
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -1712,8 +1712,8 @@ str = STR_CONFIG_SETTING_TREE_PLACE @@
 base     = GameSettings
 var      = game_creation.heightmap_rotation
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 1
@@ @@ -1723,7 +1723,7 @@ str = STR_CONFIG_SETTING_HEIGHTMAP_ @@
 base     = GameSettings
 var      = game_creation.se_flat_world_height
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 1
 min      = 0
 max      = 15
@@ @@ -1734,7 +1734,7 @@ str = STR_CONFIG_SETTING_SE_FLAT_WO @@
 base     = GameSettings
 var      = game_creation.map_x
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 8
 min      = MIN_MAP_SIZE_BITS
 max      = MAX_MAP_SIZE_BITS
@@ @@ -1743,7 +1743,7 @@ max = MAX_MAP_SIZE_BITS @@
 base     = GameSettings
 var      = game_creation.map_y
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 8
 min      = MIN_MAP_SIZE_BITS
 max      = MAX_MAP_SIZE_BITS
@@ @@ -1779,7 +1779,7 @@ base = GameSettings @@
 var      = construction.extra_tree_placement
 type     = SLE_UINT8
 from     = 132
-guiflags = MS
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -1801,7 +1801,7 @@ base = GameSettings @@
 var      = locale.currency
 type     = SLE_UINT8
 from     = 97
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = 0
 max      = CUSTOM_CURRENCY_ID
 full     = _locale_currencies
@@ @@ -1812,7 +1812,7 @@ base = GameSettings @@
 var      = locale.units
 type     = SLE_UINT8
 from     = 97
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = 1
 max      = 2
 full     = _locale_units
@@ @@ -1823,7 +1823,7 @@ base = GameSettings @@
 var      = locale.digit_group_separator
 type     = SLE_STRQ
 from     = 118
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = RedrawScreen
@@ @@ -1832,7 +1832,7 @@ base = GameSettings @@
 var      = locale.digit_group_separator_currency
 type     = SLE_STRQ
 from     = 118
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = RedrawScreen
@@ @@ -1841,7 +1841,7 @@ base = GameSettings @@
 var      = locale.digit_decimal_separator
 type     = SLE_STRQ
 from     = 126
-flags    = N
+flags    = SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = RedrawScreen
@@ @@ -1852,21 +1852,21 @@ proc = RedrawScreen @@
 [SDTC_OMANY]
 var      = gui.autosave
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 1
 max      = 4
 full     = _autosave_interval
 [SDTC_BOOL]
 var      = gui.threaded_saves
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 [SDTC_OMANY]
 var      = gui.date_format_in_default_names
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 0
 max      = 2
 full     = _savegame_date
@@ @@ -1874,44 +1874,44 @@ str = STR_CONFIG_SETTING_DATE_FORMA @@
 [SDTC_BOOL]
 var      = gui.show_finances
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_SHOWFINANCES
 [SDTC_BOOL]
 var      = gui.autoscroll
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_AUTOSCROLL
 [SDTC_BOOL]
 var      = gui.reverse_scroll
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_REVERSE_SCROLLING
 [SDTC_BOOL]
 var      = gui.smooth_scroll
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SMOOTH_SCROLLING
 [SDTC_BOOL]
 var      = gui.left_mouse_btn_scrolling
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING
 [SDTC_BOOL]
 var      = gui.measure_tooltip
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_MEASURE_TOOLTIP
 [SDTC_VAR]
 var      = gui.errmsg_duration
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 5
 min      = 0
 max      = 20
@@ @@ -1920,8 +1920,8 @@ str = STR_CONFIG_SETTING_ERRMSG_DUR @@
 [SDTC_VAR]
 var      = gui.hover_delay
 type     = SLE_UINT8
 flags    = S
 guiflags = D0
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED
 def      = 2
 min      = 1
 max      = 5
@@ @@ -1930,8 +1930,8 @@ str = STR_CONFIG_SETTING_HOVER_DELA @@
 [SDTC_VAR]
 var      = gui.toolbar_pos
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
@@ @@ -1941,8 +1941,8 @@ proc = v_PositionMainToolbar @@
 [SDTC_VAR]
 var      = gui.statusbar_pos
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
@@ @@ -1952,8 +1952,8 @@ proc = v_PositionStatusbar @@
 [SDTC_VAR]
 var      = gui.window_snap_radius
 type     = SLE_UINT8
 flags    = S
 guiflags = D0
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED
 def      = 10
 min      = 1
 max      = 32
@@ @@ -1962,8 +1962,8 @@ str = STR_CONFIG_SETTING_SNAP_RADIU @@
 [SDTC_VAR]
 var      = gui.window_soft_limit
 type     = SLE_UINT8
 flags    = S
 guiflags = D0
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED
 def      = 20
 min      = 5
 max      = 255
@@ @@ -1972,22 +1972,22 @@ str = STR_CONFIG_SETTING_SOFT_LIMIT @@
 [SDTC_BOOL]
 var      = gui.population_in_label
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_POPULATION_IN_LABEL
 proc     = PopulationInLabelActive
 [SDTC_BOOL]
 var      = gui.link_terraform_toolbar
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR
 [SDTC_VAR]
 var      = gui.smallmap_land_colour
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
@@ @@ -1997,8 +1997,8 @@ proc = RedrawSmallmap @@
 [SDTC_VAR]
 var      = gui.liveries
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -2007,15 +2007,15 @@ proc = InvalidateCompanyLiveryWindow @@
 [SDTC_BOOL]
 var      = gui.prefer_teamchat
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_PREFER_TEAMCHAT
 [SDTC_VAR]
 var      = gui.scrollwheel_scrolling
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
@@ @@ -2024,7 +2024,7 @@ str = STR_CONFIG_SETTING_SCROLLWHEE @@
 [SDTC_VAR]
 var      = gui.scrollwheel_multiplier
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 5
 min      = 1
 max      = 15
@@ @@ -2033,15 +2033,15 @@ str = STR_CONFIG_SETTING_SCROLLWHEE @@
 [SDTC_BOOL]
 var      = gui.pause_on_newgame
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME
 [SDTC_VAR]
 var      = gui.advanced_vehicle_list
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
@@ @@ -2049,29 +2049,29 @@ str = STR_CONFIG_SETTING_ADVANCED_V @@
 [SDTC_BOOL]
 var      = gui.timetable_in_ticks
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_TIMETABLE_IN_TICKS
 proc     = InvalidateVehTimetableWindow
 [SDTC_BOOL]
 var      = gui.timetable_arrival_departure
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE
 proc     = InvalidateVehTimetableWindow
 [SDTC_BOOL]
 var      = gui.quick_goto
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_QUICKGOTO
 [SDTC_VAR]
 var      = gui.loading_indicators
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
@@ @@ -2081,8 +2081,8 @@ proc = RedrawScreen @@
 [SDTC_VAR]
 var      = gui.default_rail_type
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
@@ @@ -2090,7 +2090,7 @@ str = STR_CONFIG_SETTING_DEFAULT_RA @@
 [SDTC_BOOL]
 var      = gui.enable_signal_gui
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI
 proc     = CloseSignalGUI
@@ @@ -2098,8 +2098,8 @@ proc = CloseSignalGUI @@
 [SDTC_VAR]
 var      = gui.coloured_news_year
 type     = SLE_INT32
 flags    = S
 guiflags = NC
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NOCOMMA
 def      = 2000
 min      = MIN_YEAR
 max      = MAX_YEAR
@@ @@ -2109,7 +2109,7 @@ str = STR_CONFIG_SETTING_COLOURED_N @@
 [SDTC_VAR]
 var      = gui.drag_signals_density
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 4
 min      = 1
 max      = 20
@@ @@ -2119,8 +2119,8 @@ proc = DragSignalsDensityChanged @@
 [SDTC_VAR]
 var      = gui.semaphore_build_before
 type     = SLE_INT32
 flags    = S
 guiflags = NC
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NOCOMMA
 def      = 1950
 min      = MIN_YEAR
 max      = MAX_YEAR
@@ @@ -2130,15 +2130,15 @@ proc = ResetSignalVariant @@
 [SDTC_BOOL]
 var      = gui.vehicle_income_warn
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_WARN_INCOME_LESS
 [SDTC_VAR]
 var      = gui.order_review_system
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -2146,28 +2146,28 @@ str = STR_CONFIG_SETTING_ORDER_REVI @@
 [SDTC_BOOL]
 var      = gui.lost_vehicle_warn
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_WARN_LOST_VEHICLE
 [SDTC_BOOL]
 var      = gui.disable_unsuitable_building
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING
 proc     = RedrawScreen
 [SDTC_BOOL]
 var      = gui.new_nonstop
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT
 [SDTC_VAR]
 var      = gui.stop_location
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -2176,38 +2176,38 @@ str = STR_CONFIG_SETTING_STOP_LOCAT @@
 [SDTC_BOOL]
 var      = gui.keep_all_autosave
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 [SDTC_BOOL]
 var      = gui.autosave_on_exit
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 [SDTC_VAR]
 var      = gui.max_num_autosaves
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 16
 min      = 0
 max      = 255
 [SDTC_BOOL]
 var      = gui.auto_euro
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 [SDTC_VAR]
 var      = gui.news_message_timeout
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 2
 min      = 1
 max      = 255
 [SDTC_BOOL]
 var      = gui.show_track_reservation
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION
 proc     = RedrawScreen
@@ @@ -2215,8 +2215,8 @@ proc = RedrawScreen @@
 [SDTC_VAR]
 var      = gui.default_signal_type
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
@@ @@ -2226,8 +2226,8 @@ str = STR_CONFIG_SETTING_DEFAULT_SI @@
 [SDTC_VAR]
 var      = gui.cycle_signal_types
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 2
@@ @@ -2237,7 +2237,7 @@ str = STR_CONFIG_SETTING_CYCLE_SIGN @@
 [SDTC_VAR]
 var      = gui.station_numtracks
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 1
 min      = 1
 max      = 7
@@ @@ -2245,30 +2245,30 @@ max = 7 @@
 [SDTC_VAR]
 var      = gui.station_platlength
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 5
 min      = 1
 max      = 7
 [SDTC_BOOL]
 var      = gui.station_dragdrop
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 [SDTC_BOOL]
 var      = gui.station_show_coverage
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 [SDTC_BOOL]
 var      = gui.persistent_buildingtools
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS
 [SDTC_BOOL]
 var      = gui.expenses_layout
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_EXPENSES_LAYOUT
 proc     = RedrawScreen
@@ @@ -2278,49 +2278,49 @@ proc = RedrawScreen @@
 [SDTC_BOOL]
 ifdef    = DEDICATED
 var      = gui.show_date_in_logs
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = true
 [SDTC_BOOL]
 ifndef   = DEDICATED
 var      = gui.show_date_in_logs
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 [SDTC_VAR]
 var      = gui.developer
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 1
 min      = 0
 max      = 2
 [SDTC_BOOL]
 var      = gui.newgrf_developer_tools
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 proc     = InvalidateNewGRFChangeWindows
 [SDTC_BOOL]
 var      = gui.ai_developer_tools
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 [SDTC_BOOL]
 var      = gui.scenario_developer
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 proc     = InvalidateNewGRFChangeWindows
 [SDTC_BOOL]
 var      = gui.newgrf_show_old_versions
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 [SDTC_VAR]
 var      = gui.console_backlog_timeout
 type     = SLE_UINT16
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 100
 min      = 10
 max      = 65500
@@ @@ -2328,7 +2328,7 @@ max = 65500 @@
 [SDTC_VAR]
 var      = gui.console_backlog_length
 type     = SLE_UINT16
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 100
 min      = 10
 max      = 65500
@@ @@ -2337,7 +2337,7 @@ max = 65500 @@
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_width
 type     = SLE_UINT16
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 620
 min      = 200
 max      = 65535
@@ @@ -2346,7 +2346,7 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_height
 type     = SLE_UINT8
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 25
 min      = 5
 max      = 255
@@ @@ -2355,7 +2355,7 @@ max = 255 @@
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_timeout
 type     = SLE_UINT16
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 20
 min      = 1
 max      = 65535
@@ @@ -2364,8 +2364,8 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = network.sync_freq
 type     = SLE_UINT16
 flags    = C|S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 100
 min      = 0
 max      = 100
@@ @@ -2374,8 +2374,8 @@ max = 100 @@
 ifdef    = ENABLE_NETWORK
 var      = network.frame_freq
 type     = SLE_UINT8
 flags    = C|S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 0
 min      = 0
 max      = 100
@@ @@ -2384,8 +2384,8 @@ max = 100 @@
 ifdef    = ENABLE_NETWORK
 var      = network.commands_per_frame
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 2
 min      = 1
 max      = 65535
@@ @@ -2394,8 +2394,8 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = network.max_commands_in_queue
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 16
 min      = 1
 max      = 65535
@@ @@ -2404,8 +2404,8 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = network.bytes_per_frame
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 8
 min      = 1
 max      = 65535
@@ @@ -2414,8 +2414,8 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = network.bytes_per_frame_burst
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 256
 min      = 1
 max      = 65535
@@ @@ -2424,8 +2424,8 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = network.max_join_time
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 500
 min      = 0
 max      = 32000
@@ @@ -2433,16 +2433,16 @@ max = 32000 @@
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.pause_on_join
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = true
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.server_port
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NETWORK_DEFAULT_PORT
 min      = 0
 max      = 65535
@@ @@ -2451,8 +2451,8 @@ max = 65535 @@
 ifdef    = ENABLE_NETWORK
 var      = network.server_admin_port
 type     = SLE_UINT16
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NETWORK_ADMIN_PORT
 min      = 0
 max      = 65535
@@ @@ -2460,23 +2460,23 @@ max = 65535 @@
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.server_admin_chat
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = true
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.server_advertise
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.lan_internet
 type     = SLE_UINT8
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 0
 min      = 0
 max      = 1
@@ @@ -2485,7 +2485,7 @@ max = 1 @@
 ifdef    = ENABLE_NETWORK
 var      = network.client_name
 type     = SLE_STRB
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = UpdateClientName
@@ @@ -2493,8 +2493,8 @@ proc = UpdateClientName @@
 ifdef    = ENABLE_NETWORK
 var      = network.server_password
 type     = SLE_STRB
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NULL
 proc     = UpdateServerPassword
@@ @@ -2502,8 +2502,8 @@ proc = UpdateServerPassword @@
 ifdef    = ENABLE_NETWORK
 var      = network.rcon_password
 type     = SLE_STRB
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NULL
 proc     = UpdateRconPassword
@@ @@ -2511,53 +2511,53 @@ proc = UpdateRconPassword @@
 ifdef    = ENABLE_NETWORK
 var      = network.admin_password
 type     = SLE_STRB
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NULL
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.default_company_pass
 type     = SLE_STRB
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.server_name
 type     = SLE_STRB
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NULL
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.connect_to_ip
 type     = SLE_STRB
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.network_id
 type     = SLE_STRB
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = NULL
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_companies
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_unprotected
 type     = SLE_UINT8
 flags    = S
 guiflags = D0|NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
 def      = 12
 min      = 0
 max      = 240
@@ @@ -2566,8 +2566,8 @@ max = 240 @@
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_protected
 type     = SLE_UINT8
 flags    = S
 guiflags = D0|NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
 def      = 36
 min      = 0
 max      = 240
@@ @@ -2576,8 +2576,8 @@ max = 240 @@
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_novehicles
 type     = SLE_UINT8
 flags    = S
 guiflags = D0|NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY
 def      = 0
 min      = 0
 max      = 240
@@ @@ -2586,8 +2586,8 @@ max = 240 @@
 ifdef    = ENABLE_NETWORK
 var      = network.max_companies
 type     = SLE_UINT8
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 15
 min      = 1
 max      = MAX_COMPANIES
@@ @@ -2597,8 +2597,8 @@ proc = UpdateClientConfigValues @@
 ifdef    = ENABLE_NETWORK
 var      = network.max_clients
 type     = SLE_UINT8
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 25
 min      = 2
 max      = MAX_CLIENTS
@@ @@ -2607,8 +2607,8 @@ max = MAX_CLIENTS @@
 ifdef    = ENABLE_NETWORK
 var      = network.max_spectators
 type     = SLE_UINT8
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 15
 min      = 0
 max      = MAX_CLIENTS
@@ @@ -2618,8 +2618,8 @@ proc = UpdateClientConfigValues @@
 ifdef    = ENABLE_NETWORK
 var      = network.restart_game_year
 type     = SLE_INT32
 flags    = S
 guiflags = D0|NO|NC
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_0ISDISABLED | SGF_NETWORK_ONLY | SGF_NOCOMMA
 def      = 0
 min      = MIN_YEAR
 max      = MAX_YEAR
@@ @@ -2629,8 +2629,8 @@ interval = 1 @@
 ifdef    = ENABLE_NETWORK
 var      = network.min_active_clients
 type     = SLE_UINT8
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 0
 min      = 0
 max      = MAX_CLIENTS
@@ @@ -2639,8 +2639,8 @@ max = MAX_CLIENTS @@
 ifdef    = ENABLE_NETWORK
 var      = network.server_lang
 type     = SLE_UINT8
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = 0
 max      = 35
 full     = _server_langs
@@ @@ -2648,22 +2648,22 @@ full = _server_langs @@
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.reload_cfg
 flags    = S
 guiflags = NO
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.last_host
 type     = SLE_STRB
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = """"
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.last_port
 type     = SLE_UINT16
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 0
 min      = 0
 max      = UINT16_MAX
@@ @@ -2671,7 +2671,7 @@ max = UINT16_MAX @@
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.no_http_content_downloads
-flags    = S
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 ; Since the network code (CmdChangeSetting and friends) use the index in this array to decide
@@ @@ -2685,8 +2685,8 @@ def = false @@
 ifdef    = __APPLE__
 var      = gui.right_mouse_btn_emulation
 type     = SLE_UINT8
 flags    = S
 guiflags = MS
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2

src/table/win32_settings.ini

➞

Show inline comments

@@ @@ -14,7 +14,7 @@ SDTG_VAR = SDTG_VAR($name, $type, $fla @@
 SDTG_END  = SDTG_END()
 [defaults]
-flags    = 0
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = 0
 interval = 0
 str      = STR_NULL
@@ @@ -28,7 +28,6 @@ to = SL_MAX_VERSION @@
 [SDTG_VAR]
 name     = ""display_hz""
 type     = SLE_UINT
 flags    = S
 var      = _display_hz
 def      = 0
 min      = 0
@@ @@ -36,14 +35,12 @@ max = 120 @@
 [SDTG_BOOL]
 name     = ""force_full_redraw""
 flags    = S
 var      = _force_full_redraw
 def      = false
 [SDTG_VAR]
 name     = ""fullscreen_bpp""
 type     = SLE_UINT
 flags    = S
 var      = _fullscreen_bpp
 def      = 8
 min      = 8
@@ @@ -51,7 +48,6 @@ max = 32 @@
 [SDTG_BOOL]
 name     = ""window_maximize""
 flags    = S
 var      = _window_maximize
 def      = false

0 comments (0 inline, 0 general)