Replace std::list by std::vector into ServerMap::listAllLoadableBlocks ServerMap...

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index e81793ff8b5a34d9dc1b7b1ed1ca635eaab0aa44..c485caffa60595f2201b4741bd9d483339811b5a 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -167,13 +167,6 @@ EmergeManager::~EmergeManager()
 void EmergeManager::loadMapgenParams()
 {
        loadParamsFromSettings(g_settings);
-
-       if (g_settings->get("fixed_map_seed").empty()) {
-               params.seed = (((u64)(myrand() & 0xffff) << 0)
-                                        | ((u64)(myrand() & 0xffff) << 16)
-                                        | ((u64)(myrand() & 0xffff) << 32)
-                                        | ((u64)(myrand() & 0xffff) << 48));
-       }
 }
 
 
@@ -368,8 +361,15 @@ 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))
+       if (settings->getNoEx(setname, seed_str) && !seed_str.empty()) {
                params.seed = read_seed(seed_str.c_str());
+       } else {
+               params.seed =
+                       ((u64)(myrand() & 0xffff) << 0)  |
+                       ((u64)(myrand() & 0xffff) << 16) |
+                       ((u64)(myrand() & 0xffff) << 32) |
+                       ((u64)(myrand() & 0xffff) << 48);
+       }
 
        settings->getNoEx("mg_name",         params.mg_name);
        settings->getS16NoEx("water_level",  params.water_level);
@@ -380,8 +380,11 @@ void EmergeManager::loadParamsFromSettings(Settings *settings)
 
        delete params.sparams;
        params.sparams = createMapgenParams(params.mg_name);
-       if (params.sparams)
+
+       if (params.sparams) {
+               params.sparams->readParams(g_settings);
                params.sparams->readParams(settings);
+       }
 }