diff options
| author | fz72 <fz72@gmx.de> | 2015-02-17 16:53:49 +0100 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2015-02-18 14:02:30 +0200 |
| commit | 9ef2e5000f6df5a0c16e0343c6af59967150db42 (patch) | |
| tree | 2969d1e1f6c19f1f9e4ceb42ee2269266f723a9e | |
| parent | 678546308ef2cf4b45c557dc5c227354a216486f (diff) | |
| download | minetest-9ef2e5000f6df5a0c16e0343c6af59967150db42.tar.gz minetest-9ef2e5000f6df5a0c16e0343c6af59967150db42.tar.bz2 minetest-9ef2e5000f6df5a0c16e0343c6af59967150db42.zip | |
Fix map_seed not changed when creating a new world after login to another
| -rw-r--r-- | builtin/mainmenu/dlg_create_world.lua | 4 | ||||
| -rw-r--r-- | src/emerge.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 32e1fbf83..b42d119e0 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -90,6 +90,8 @@ local function create_world_buttonhandler(this, fields) local message = nil + core.setting_set("fixed_map_seed", fields["te_seed"]) + if not menudata.worldlist:uid_exists_raw(worldname) then core.setting_set("mg_name",fields["dd_mapgen"]) message = core.create_world(worldname,gameindex) @@ -97,8 +99,6 @@ local function create_world_buttonhandler(this, fields) message = fgettext("A world named \"$1\" already exists", worldname) end - core.setting_set("fixed_map_seed", fields["te_seed"]) - if message ~= nil then gamedata.errormessage = message else 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 = |