Update to 1.10.0-beta1

src/table/gameopt_settings.ini

@@ -12,7 +12,7 @@ static uint16 _old_diff_custom[GAME_DIFFICULTY_NUM];
 uint8 _old_diff_level;                                 ///< Old difficulty level from old savegames
 uint8 _old_units;                                      ///< Old units from old savegames
 
-/* Most of these strings are used both for gameopt-backward compatability
+/* Most of these strings are used both for gameopt-backward compatibility
  * and the settings tables. The rest is here for consistency. */
 static const char *_locale_currencies = "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|RON|RUR|SIT|SEK|YTL|SKK|BRL|EEK|custom";
 static const char *_locale_units = "imperial|metric|si";
@@ -21,9 +21,7 @@ static const char *_climates = "temperate|arctic|tropic|toyland";
 static const char *_autosave_interval = "off|monthly|quarterly|half year|yearly";
 static const char *_roadsides = "left|right";
 static const char *_savegame_date = "long|short|iso";
-#ifdef ENABLE_NETWORK
 static const char *_server_langs = "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN";
-#endif /* ENABLE_NETWORK */
 static const char *_osk_activation = "disabled|double|single|immediately";
 static const char *_settings_profiles = "easy|medium|hard";
 static const char *_news_display = "off|summarized|full";
@@ -52,13 +50,13 @@ SDT_END      = SDT_END()
 
 [defaults]
 flags    = 0
-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
@@ -76,7 +74,7 @@ length   = 17
 def      = 0
 min      = 0
 max      = 0
-full     = NULL
+full     = nullptr
 to       = SLV_4
 
 [SDTG_GENERAL]
@@ -90,7 +88,7 @@ length   = 18
 def      = 0
 min      = 0
 max      = 0
-full     = NULL
+full     = nullptr
 from     = SLV_4
 
 ##