aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfz72 <fz72@gmx.de>2015-02-17 16:53:49 +0100
committerPerttu Ahola <celeron55@gmail.com>2015-02-18 14:02:30 +0200
commit9ef2e5000f6df5a0c16e0343c6af59967150db42 (patch)
tree2969d1e1f6c19f1f9e4ceb42ee2269266f723a9e /src
parent678546308ef2cf4b45c557dc5c227354a216486f (diff)
downloadminetest-9ef2e5000f6df5a0c16e0343c6af59967150db42.tar.gz
minetest-9ef2e5000f6df5a0c16e0343c6af59967150db42.tar.bz2
minetest-9ef2e5000f6df5a0c16e0343c6af59967150db42.zip
Fix map_seed not changed when creating a new world after login to another
Diffstat (limited to 'src')
-rw-r--r--src/emerge.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp
index c485caffa..a697bcb07 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -361,7 +361,10 @@ void EmergeManager::loadParamsFromSettings(Settings *settings)
std::string seed_str;
const char *setname = (settings == g_settings) ? "fixed_map_seed" : "seed";
- if (settings->getNoEx(setname, seed_str) && !seed_str.empty()) {
+ if (!settings->getNoEx("seed", seed_str)) {
+ g_settings->getNoEx(setname, seed_str);
+ }
+ if (!seed_str.empty()) {
params.seed = read_seed(seed_str.c_str());
} else {
params.seed =