Fix MinGW build

[dragonfireclient.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index a81ff7d929be8416947f983d5ccfb79a3848158d..e66e9520bf587edc2f2f5050b3009e059cdead67 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include <iostream>
 #include <queue>
+#include "jthread/jevent.h"
 #include "map.h"
 #include "environment.h"
 #include "util/container.h"
@@ -106,7 +107,6 @@ EmergeManager::EmergeManager(IGameDef *gamedef) {
        
        mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
 
-       queuemutex.Init();
        
        int nthreads;
        if (g_settings->get("num_emerge_threads").empty()) {
@@ -351,8 +351,11 @@ MapgenParams *EmergeManager::getParamsFromSettings(Settings *settings) {
        if (!mgparams)
                return NULL;
        
+       std::string seedstr = settings->get(settings == g_settings ?
+                                                                       "fixed_map_seed" : "seed");
+       
        mgparams->mg_name     = mg_name;
-       mgparams->seed        = settings->getU64(settings == g_settings ? "fixed_map_seed" : "seed");
+       mgparams->seed        = read_seed(seedstr.c_str());
        mgparams->water_level = settings->getS16("water_level");
        mgparams->chunksize   = settings->getS16("chunksize");
        mgparams->flags       = settings->getFlagStr("mg_flags", flagdesc_mapgen);
@@ -382,7 +385,7 @@ void EmergeManager::registerMapgen(std::string mgname, MapgenFactory *mgfactory)
 }
 
 
-////////////////////////////// Emerge Thread ////////////////////////////////// 
+////////////////////////////// Emerge Thread //////////////////////////////////
 
 bool EmergeThread::popBlockEmerge(v3s16 *pos, u8 *flags) {
        std::map<v3s16, BlockEmergeData *>::iterator iter;
@@ -396,7 +399,7 @@ bool EmergeThread::popBlockEmerge(v3s16 *pos, u8 *flags) {
        *pos = p;
        
        iter = emerge->blocks_enqueued.find(p);
-       if (iter == emerge->blocks_enqueued.end()) 
+       if (iter == emerge->blocks_enqueued.end())
                return false; //uh oh, queue and map out of sync!!
 
        BlockEmergeData *bedata = iter->second;
@@ -411,11 +414,11 @@ bool EmergeThread::popBlockEmerge(v3s16 *pos, u8 *flags) {
 }
 
 
-bool EmergeThread::getBlockOrStartGen(v3s16 p, MapBlock **b, 
+bool EmergeThread::getBlockOrStartGen(v3s16 p, MapBlock **b,
                                                                        BlockMakeData *data, bool allow_gen) {
        v2s16 p2d(p.X, p.Z);
        //envlock: usually takes <=1ms, sometimes 90ms or ~400ms to acquire
-       JMutexAutoLock envlock(m_server->m_env_mutex); 
+       JMutexAutoLock envlock(m_server->m_env_mutex);
        
        // Load sector if it isn't loaded
        if (map->getSectorNoGenerateNoEx(p2d) == NULL)
@@ -426,6 +429,8 @@ bool EmergeThread::getBlockOrStartGen(v3s16 p, MapBlock **b,
        if (!block || block->isDummy() || !block->isGenerated()) {
                EMERGE_DBG_OUT("not in memory, attempting to load from disk");
                block = map->loadBlock(p);
+               if (block && block->isGenerated())
+                       map->prepareBlock(block);
        }
 
        // If could not load and allowed to generate,
@@ -491,7 +496,7 @@ void *EmergeThread::Thread() {
 
                        {
                                //envlock: usually 0ms, but can take either 30 or 400ms to acquire
-                               JMutexAutoLock envlock(m_server->m_env_mutex); 
+                               JMutexAutoLock envlock(m_server->m_env_mutex);
                                ScopeProfiler sp(g_profiler, "EmergeThread: after "
                                                "Mapgen::makeChunk (envlock)", SPT_AVG);
 
@@ -508,12 +513,11 @@ void *EmergeThread::Thread() {
 
                                        // Ignore map edit events, they will not need to be sent
                                        // to anybody because the block hasn't been sent to anybody
-                                       MapEditEventAreaIgnorer 
+                                       MapEditEventAreaIgnorer
                                                ign(&m_server->m_ignore_map_edit_events_area,
                                                VoxelArea(minp, maxp));
                                        {  // takes about 90ms with -O1 on an e3-1230v2
-                                               m_server->getScriptIface()->
-                                                               environment_OnGenerated(
+                                               m_server->getScriptIface()->environment_OnGenerated(
                                                                minp, maxp, emerge->getBlockSeed(minp));
                                        }
 
@@ -535,14 +539,6 @@ void *EmergeThread::Thread() {
                if (block)
                        modified_blocks[p] = block;
 
-               // Update weather data in mapblock
-               for(std::map<v3s16, MapBlock *>::iterator
-                       i = modified_blocks.begin();
-                       i != modified_blocks.end(); ++i) {
-                       map->getHeat(m_server->m_env, MAP_BLOCKSIZE*i->first ,i->second);
-                       map->getHumidity(m_server->m_env, MAP_BLOCKSIZE*i->first, i->second);
-               }
-
                // Set the modified blocks unsent for all the clients
                for (std::map<u16, RemoteClient*>::iterator
                         i = m_server->m_clients.begin();