summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2018-03-11 12:11:09 +0000
committerfrosch <frosch@openttd.org>2018-03-11 12:11:09 +0000
commit59dd7be6863b88ffd80d1f8199611e9cc23afaf4 (patch)
tree585c3c8576bc24b1bea298be9812d2e428ff7a15 /src
parent6eac63622ee523a9bebbc49bd8acd791440c3bc9 (diff)
downloadopenttd-59dd7be6863b88ffd80d1f8199611e9cc23afaf4.tar.xz
(svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu)
Diffstat (limited to 'src')
-rw-r--r--src/saveload/saveload.cpp3
-rw-r--r--src/table/settings.ini2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index dfa3be721..2c00ecc4a 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -264,8 +264,9 @@
* 194 26881 1.5.x, 1.6.0
* 195 27572 1.6.x
* 196 27778 1.7.x
+ * 197 27978
*/
-extern const uint16 SAVEGAME_VERSION = 196; ///< Current savegame version of OpenTTD.
+extern const uint16 SAVEGAME_VERSION = 197; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading
FileToSaveLoad _file_to_saveload; ///< File to save or load in the openttd loop.
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 23fca32a4..2554a2ece 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2189,7 +2189,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