Remove Android makefile ugly make -j hack

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 8da1a2bfd24ea147a7043079f26a62ca22282626..89153cdb6017be87b1edfc3fd9c106c268658f38 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();
@@ -166,14 +166,7 @@ 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));
-       }
+       params.load(*g_settings);
 }
 
 
@@ -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;
@@ -351,9 +344,9 @@ Mapgen *EmergeManager::createMapgen(const std::string &mgname, int mgid,
 MapgenSpecificParams *EmergeManager::createMapgenParams(const std::string &mgname)
 {
        u32 i;
-       for (i = 0; i != ARRLEN(reg_mapgens) && mgname != reg_mapgens[i].name; i++);
+       for (i = 0; i < ARRLEN(reg_mapgens) && mgname != reg_mapgens[i].name; i++);
        if (i == ARRLEN(reg_mapgens)) {
-               errorstream << "EmergeManager; mapgen " << mgname <<
+               errorstream << "EmergeManager: Mapgen " << mgname <<
                        " not registered" << std::endl;
                return NULL;
        }
@@ -363,43 +356,6 @@ MapgenSpecificParams *EmergeManager::createMapgenParams(const std::string &mgnam
 }
 
 
-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))
-               params.seed = read_seed(seed_str.c_str());
-
-       settings->getNoEx("mg_name",         params.mg_name);
-       settings->getS16NoEx("water_level",  params.water_level);
-       settings->getS16NoEx("chunksize",    params.chunksize);
-       settings->getFlagStrNoEx("mg_flags", params.flags, flagdesc_mapgen);
-       settings->getNoiseParams("mg_biome_np_heat",     params.np_biome_heat);
-       settings->getNoiseParams("mg_biome_np_humidity", params.np_biome_humidity);
-
-       delete params.sparams;
-       params.sparams = createMapgenParams(params.mg_name);
-       if (params.sparams)
-               params.sparams->readParams(settings);
-}
-
-
-void EmergeManager::saveParamsToSettings(Settings *settings)
-{
-       settings->set("mg_name",         params.mg_name);
-       settings->setU64("seed",         params.seed);
-       settings->setS16("water_level",  params.water_level);
-       settings->setS16("chunksize",    params.chunksize);
-       settings->setFlagStr("mg_flags", params.flags, flagdesc_mapgen, (u32)-1);
-       settings->setNoiseParams("mg_biome_np_heat",     params.np_biome_heat);
-       settings->setNoiseParams("mg_biome_np_humidity", params.np_biome_humidity);
-
-       if (params.sparams)
-               params.sparams->writeParams(settings);
-}
-
-
 ////////////////////////////// Emerge Thread //////////////////////////////////
 
 bool EmergeThread::popBlockEmerge(v3s16 *pos, u8 *flags)
@@ -580,6 +536,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;