Merge branch 'master' into cpp-11

This commit is contained in:
Jonathan G Rennison
2019-01-13 22:49:55 +00:00
143 changed files with 1012 additions and 320 deletions

View File

@@ -29,7 +29,7 @@ struct Randomizer {
void SetSeed(uint32 seed);
};
extern Randomizer _random; ///< Random used in the game state calculations
extern Randomizer _interactive_random; ///< Random used every else where is does not (directly) influence the game state
extern Randomizer _interactive_random; ///< Random used everywhere else, where it does not (directly) influence the game state
/** Stores the state of all random number generators */
struct SavedRandomSeeds {