summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-03-25 23:10:38 +0100
committerPatric Stout <github@truebrain.nl>2021-03-26 12:22:32 +0100
commit13a52644381b5b4f2f7122d81fee9fb95cc5337a (patch)
tree7ca07f0645db6aca03361d81907b526a62517f18 /src
parentf05e2e0d408cfd018d9875855bd28383569481a9 (diff)
downloadopenttd-13a52644381b5b4f2f7122d81fee9fb95cc5337a.tar.xz
Fix: store the recent new game_creation settings in savegames
This allows us to later on see what someone did, and makes sure that "restart" command still knows how the game was created.
Diffstat (limited to 'src')
-rw-r--r--src/saveload/saveload.h5
-rw-r--r--src/table/settings.ini8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index e23c9c47f..8ad29a640 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -302,7 +302,7 @@ enum SaveLoadVersion : uint16 {
SLV_SCRIPT_MEMLIMIT, ///< 215 PR#7516 Limit on AI/GS memory consumption.
SLV_MULTITILE_DOCKS, ///< 216 PR#7380 Multiple docks per station.
SLV_TRADING_AGE, ///< 217 PR#7780 Configurable company trading age.
- SLV_ENDING_YEAR, ///< 218 PR#7747 v1.10 Configurable ending year.
+ SLV_ENDING_YEAR, ///< 218 PR#7747 v1.10 Configurable ending year.
SLV_REMOVE_TOWN_CARGO_CACHE, ///< 219 PR#8258 Remove town cargo acceptance and production caches.
/* Patchpacks for a while considered it a good idea to jump a few versions
@@ -323,7 +323,8 @@ enum SaveLoadVersion : uint16 {
SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 and PR#8115 GS industry control.
SLV_VEH_MOTION_COUNTER, ///< 288 PR#8591 Desync safe motion counter
- SLV_INDUSTRY_TEXT, ///< 289 PR#8576 v1.11 Additional GS text for industries.
+ SLV_INDUSTRY_TEXT, ///< 289 PR#8576 v1.11.0-RC1 Additional GS text for industries.
+ SLV_MAPGEN_SETTINGS_REVAMP, ///< 290 PR#8891 v1.11 Revamp of some mapgen settings (snow coverage, desert coverage, heightmap height, custom terrain type).
SL_MAX_VERSION, ///< Highest possible saveload version
};
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 9f5a9b212..c4a6aeafc 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -409,7 +409,7 @@ cat = SC_ADVANCED
base = GameSettings
var = game_creation.heightmap_height
type = SLE_UINT8
-flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
min = MIN_HEIGHTMAP_HEIGHT
@@ -1433,7 +1433,7 @@ cat = SC_BASIC
base = GameSettings
var = game_creation.snow_coverage
type = SLE_UINT8
-flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = DEF_SNOW_COVERAGE
min = 0
@@ -1448,7 +1448,7 @@ cat = SC_BASIC
base = GameSettings
var = game_creation.desert_coverage
type = SLE_UINT8
-flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = DEF_DESERT_COVERAGE
min = 0
@@ -2467,7 +2467,7 @@ cat = SC_BASIC
base = GameSettings
var = game_creation.custom_terrain_type
type = SLE_UINT8
-flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+from = SLV_MAPGEN_SETTINGS_REVAMP
guiflags = SGF_NEWGAME_ONLY
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
min = MIN_CUSTOM_TERRAIN_TYPE