Merge branch 'save_ext' into enhanced_viewport_overlay

# Conflicts: # src/industry_cmd.cpp # src/vehicle.cpp
2018-03-11 22:16:19 +00:00
parent 2574e46df8 16c67ea484
commit 864d94d2c5
155 changed files with 7373 additions and 1175 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2198,7 +2198,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.variety
 type     = SLE_UINT8
-flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+from     = 197
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 0
 min      = 0