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 aa2c3c5319ee7e903696af66ba08c4703dcddd28..c485caffa60595f2201b4741bd9d483339811b5a 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -140,7 +140,7 @@ EmergeManager::EmergeManager(IGameDef *gamedef)
 
 EmergeManager::~EmergeManager()
 {
-       for (unsigned int i = 0; i != emergethread.size(); i++) {
+       for (u32 i = 0; i != emergethread.size(); i++) {
                if (threads_active) {
                        emergethread[i]->Stop();
                        emergethread[i]->qevent.signal();
@@ -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));
-       }
 }
 
 
@@ -193,7 +186,7 @@ void EmergeManager::initMapgens()
        }
 
        // Create the mapgens
-       for (size_t i = 0; i != emergethread.size(); i++) {
+       for (u32 i = 0; i != emergethread.size(); i++) {
                Mapgen *mg = createMapgen(params.mg_name, i, &params);
                assert(mg);
                mapgen.push_back(mg);
@@ -203,7 +196,7 @@ void EmergeManager::initMapgens()
 
 Mapgen *EmergeManager::getCurrentMapgen()
 {
-       for (unsigned int i = 0; i != emergethread.size(); i++) {
+       for (u32 i = 0; i != emergethread.size(); i++) {
                if (emergethread[i]->IsSameThread())
                        return emergethread[i]->mapgen;
        }
@@ -217,7 +210,7 @@ void EmergeManager::startThreads()
        if (threads_active)
                return;
 
-       for (unsigned int i = 0; i != emergethread.size(); i++)
+       for (u32 i = 0; i != emergethread.size(); i++)
                emergethread[i]->Start();
 
        threads_active = true;
@@ -230,13 +223,13 @@ void EmergeManager::stopThreads()
                return;
 
        // Request thread stop in parallel
-       for (unsigned int i = 0; i != emergethread.size(); i++) {
+       for (u32 i = 0; i != emergethread.size(); i++) {
                emergethread[i]->Stop();
                emergethread[i]->qevent.signal();
        }
 
        // Then do the waiting for each
-       for (unsigned int i = 0; i != emergethread.size(); i++)
+       for (u32 i = 0; i != emergethread.size(); i++)
                emergethread[i]->Wait();
 
        threads_active = false;
@@ -282,7 +275,7 @@ bool EmergeManager::enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate
 
                // insert into the EmergeThread queue with the least items
                int lowestitems = emergethread[0]->blockqueue.size();
-               for (unsigned int i = 1; i != emergethread.size(); i++) {
+               for (u32 i = 1; i != emergethread.size(); i++) {
                        int nitems = emergethread[i]->blockqueue.size();
                        if (nitems < lowestitems) {
                                idx = i;
@@ -325,15 +318,6 @@ bool EmergeManager::isBlockUnderground(v3s16 blockpos)
 }
 
 
-u32 EmergeManager::getBlockSeed(v3s16 p)
-{
-       return (u32)(params.seed & 0xFFFFFFFF) +
-               p.Z * 38134234 +
-               p.Y * 42123 +
-               p.X * 23;
-}
-
-
 void EmergeManager::getMapgenNames(std::list<const char *> &mgnames)
 {
        for (u32 i = 0; i != ARRLEN(reg_mapgens); i++)
@@ -377,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);
@@ -389,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);
+       }
 }
 
 
@@ -547,7 +541,7 @@ void *EmergeThread::Thread()
                                                VoxelArea(minp, maxp));
                                        try {  // takes about 90ms with -O1 on an e3-1230v2
                                                m_server->getScriptIface()->environment_OnGenerated(
-                                                               minp, maxp, emerge->getBlockSeed(minp));
+                                                               minp, maxp, mapgen->blockseed);
                                        } catch(LuaError &e) {
                                                m_server->setAsyncFatalError(e.what());
                                        }
@@ -589,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;