Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp

# Conflicts: # src/saveload/afterload.cpp # src/saveload/saveload.cpp
2019-01-22 18:42:01 +00:00
parent 8e832afb65 5d8b9de482
commit 094160ede3
8 changed files with 61 additions and 2 deletions
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -330,6 +330,7 @@ struct NetworkSettings {
 /** Settings related to the creation of games. */
 struct GameCreationSettings {
 	uint32 generation_seed;                  ///< noise seed for world generation
+	uint32 generation_unique_id;             ///< random id to differentiate savegames
 	Year   starting_year;                    ///< starting date
 	uint8  map_x;                            ///< X size of map
 	uint8  map_y;                            ///< Y size of map