Update to 1.10.0-beta1

src/table/misc_settings.ini

@@ -25,13 +25,13 @@ SDTG_END   = SDTG_END()
 
 [defaults]
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = 0
+guiflags = SGF_NONE
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
@@ -64,55 +64,55 @@ cat      = SC_BASIC
 name     = ""graphicsset""
 type     = SLE_STRQ
 var      = BaseGraphics::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""soundsset""
 type     = SLE_STRQ
 var      = BaseSounds::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""musicset""
 type     = SLE_STRQ
 var      = BaseMusic::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""videodriver""
 type     = SLE_STRQ
 var      = _ini_videodriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""musicdriver""
 type     = SLE_STRQ
 var      = _ini_musicdriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""sounddriver""
 type     = SLE_STRQ
 var      = _ini_sounddriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""blitter""
 type     = SLE_STRQ
 var      = _ini_blitter
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 name     = ""language""
 type     = SLE_STRB
 var      = _config_language_file
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 ; workaround for implicit lengthof() in SDTG_LIST
@@ -128,14 +128,14 @@ cat      = SC_BASIC
 name     = ""screenshot_format""
 type     = SLE_STRB
 var      = _screenshot_format_name
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""savegame_format""
 type     = SLE_STRB
 var      = _savegame_format
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_BOOL]
@@ -144,35 +144,35 @@ var      = _rightclick_emulate
 def      = false
 
 [SDTG_STR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""small_font""
 type     = SLE_STRB
 var      = _freetype.small.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""medium_font""
 type     = SLE_STRB
 var      = _freetype.medium.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""large_font""
 type     = SLE_STRB
 var      = _freetype.large.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""mono_font""
 type     = SLE_STRB
 var      = _freetype.mono.font
-def      = NULL
+def      = nullptr
 
 [SDTG_VAR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""small_size""
 type     = SLE_UINT
 var      = _freetype.small.size
@@ -181,7 +181,7 @@ min      = 0
 max      = 72
 
 [SDTG_VAR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""medium_size""
 type     = SLE_UINT
 var      = _freetype.medium.size
@@ -190,7 +190,7 @@ min      = 0
 max      = 72
 
 [SDTG_VAR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""large_size""
 type     = SLE_UINT
 var      = _freetype.large.size
@@ -199,7 +199,7 @@ min      = 0
 max      = 72
 
 [SDTG_VAR]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""mono_size""
 type     = SLE_UINT
 var      = _freetype.mono.size
@@ -208,25 +208,25 @@ min      = 0
 max      = 72
 
 [SDTG_BOOL]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""small_aa""
 var      = _freetype.small.aa
 def      = false
 
 [SDTG_BOOL]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""medium_aa""
 var      = _freetype.medium.aa
 def      = false
 
 [SDTG_BOOL]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""large_aa""
 var      = _freetype.large.aa
 def      = false
 
 [SDTG_BOOL]
-ifdef    = WITH_FREETYPE
+ifdef    = HAS_TRUETYPE_FONT
 name     = ""mono_aa""
 var      = _freetype.mono.aa
 def      = false
@@ -280,14 +280,14 @@ cat      = SC_BASIC
 name     = ""keyboard""
 type     = SLE_STRB
 var      = _keyboard_opt[0]
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""keyboard_caps""
 type     = SLE_STRB
 var      = _keyboard_opt[1]
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_VAR]