Merge branch 'master' into save_ext

# Conflicts: # src/saveload/saveload.cpp # src/table/settings.h.preamble
2018-07-02 18:41:39 +01:00
parent a3156804c5 8f278b3405
commit 373ff3dd4e
171 changed files with 3349 additions and 1011 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2996,6 +2996,12 @@ flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 cat      = SC_BASIC

+[SDTC_BOOL]
+var      = gui.autosave_on_network_disconnect
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = true
+cat      = SC_EXPERT
+
 [SDTC_VAR]
 var      = gui.max_num_autosaves
 type     = SLE_UINT8