diff options
| author | sfan5 <sfan5@live.de> | 2022-01-09 21:15:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 21:15:35 +0100 |
| commit | 4c8c6497799c83cb5bac773ac4eac7ea572ec78f (patch) | |
| tree | ffa67ce9002a94f6354eedbc94a1b768ed0cd336 /src/mapgen | |
| parent | b164e16d1be30220029729d63a1e621395ad00ad (diff) | |
| download | minetest-4c8c6497799c83cb5bac773ac4eac7ea572ec78f.tar.gz minetest-4c8c6497799c83cb5bac773ac4eac7ea572ec78f.tar.bz2 minetest-4c8c6497799c83cb5bac773ac4eac7ea572ec78f.zip | |
Mainmenu game-related changes (#11887)
fixes:
* Switching between games does not immediately hide creative mode / damage buttons if so specified
* World creation menu has a game selection list even though the menu already provides a gamebar
* Showing gameid in world list is unnecessary
* Choice of mapgen parameters in menu persists between games (and was half-broken)
Diffstat (limited to 'src/mapgen')
| -rw-r--r-- | src/mapgen/mapgen.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp index 7984ff609..d767bd264 100644 --- a/src/mapgen/mapgen.cpp +++ b/src/mapgen/mapgen.cpp @@ -1018,10 +1018,11 @@ MapgenParams::~MapgenParams() void MapgenParams::readParams(const Settings *settings) { - std::string seed_str; - const char *seed_name = (settings == g_settings) ? "fixed_map_seed" : "seed"; + // should always be used via MapSettingsManager + assert(settings != g_settings); - if (settings->getNoEx(seed_name, seed_str)) { + std::string seed_str; + if (settings->getNoEx("seed", seed_str)) { if (!seed_str.empty()) seed = read_seed(seed_str.c_str()); else |