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

1 files changed, 1 insertions, 32 deletions

diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index 0d9145a47..6089d9c76 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -13,7 +13,7 @@ SDTG_VAR   =   SDTG_VAR($name, $type,          $flags, $guiflags, $var, $def, $m
 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