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 8d818612618e17aeefa8f0b0ba2ec1ec3020819c..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);
+       }
 }
 
 
@@ -580,6 +583,23 @@ void *EmergeThread::Thread()
                m_server->setAsyncFatalError(err.str());
        }
 
+       {
+               JMutexAutoLock queuelock(emerge->queuemutex);
+               while (!blockqueue.empty())
+               {
+                       v3s16 p = blockqueue.front();
+                       blockqueue.pop();
+
+                       std::map<v3s16, BlockEmergeData *>::iterator iter;
+                       iter = emerge->blocks_enqueued.find(p);
+                       if (iter == emerge->blocks_enqueued.end())
+                               continue; //uh oh, queue and map out of sync!!
+
+                       BlockEmergeData *bedata = iter->second;
+                       delete bedata;
+               }
+       }
+
        END_DEBUG_EXCEPTION_HANDLER(errorstream)
        log_deregister_thread();
        return NULL;