Fix EmergeThread hang on exit

[minetest.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index d6d8c561157c58782622550dd22fea950f68f79d..7eb45463f7a2ab1e035c21906d1aadfbac7d415f 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -33,6 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "util/directiontables.h"
 #include "rollback_interface.h"
+#include "emerge.h"
+#include "mapgen_v6.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -1993,7 +1995,6 @@ void Map::removeNodeTimer(v3s16 p)
 /*
        ServerMap
 */
-
 ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge):
        Map(dout_server, gamedef),
        m_seed(0),
@@ -2005,25 +2006,20 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emer
        verbosestream<<__FUNCTION_NAME<<std::endl;
 
        m_emerge = emerge;
-
-       //m_chunksize = 8; // Takes a few seconds
+       m_mgparams = m_emerge->getParamsFromSettings(g_settings);
+       if (!m_mgparams)
+               m_mgparams = new MapgenV6Params();
+               
+       m_seed = m_mgparams->seed;
 
        if (g_settings->get("fixed_map_seed").empty())
        {
-               m_seed = (((u64)(myrand()%0xffff)<<0)
-                               + ((u64)(myrand()%0xffff)<<16)
-                               + ((u64)(myrand()%0xffff)<<32)
-                               + ((u64)(myrand()&0xffff)<<48));
-       }
-       else
-       {
-               m_seed = g_settings->getU64("fixed_map_seed");
+               m_seed = (((u64)(myrand() & 0xffff) << 0)
+                               | ((u64)(myrand() & 0xffff) << 16)
+                               | ((u64)(myrand() & 0xffff) << 32)
+                               | ((u64)(myrand() & 0xffff) << 48));
+               m_mgparams->seed = m_seed;
        }
-       //emerge->params.seed = m_seed;
-       //emerge->params.water_level = g_settings->getS16("default_water_level");
-       //mapgen version
-       //chunksize
-       //noiseparams
 
        /*
                Experimental and debug stuff
@@ -2057,6 +2053,10 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emer
                                        // Load map metadata (seed, chunksize)
                                        loadMapMeta();
                                }
+                               catch(SettingNotFoundException &e){
+                                       infostream<<"ServerMap:  Some metadata not found."
+                                                         <<" Using default settings."<<std::endl;
+                               }
                                catch(FileNotGoodException &e){
                                        infostream<<"WARNING: Could not load map metadata"
                                                        //<<" Disabling chunk-based generator."
@@ -3079,31 +3079,7 @@ void ServerMap::saveMapMeta()
 
        Settings params;
 
-       params.setS16("mg_version", m_emerge->mg_version);
-
-       params.setU64("seed", m_emerge->params->seed);
-       params.setS16("water_level", m_emerge->params->water_level);
-       params.setS16("chunksize", m_emerge->params->chunksize);
-       params.setS32("flags", m_emerge->params->flags);
-       switch (m_emerge->mg_version) {
-               case 6:
-               {
-                       MapgenV6Params *v6params = m_emerge->params;
-
-                       params.setFloat("freq_desert", v6params->freq_desert);
-                       params.setFloat("freq_beach", v6params->freq_beach);
-
-                       break;
-               }
-               case 7:
-               {
-                       MapgenV7Params *v7params = m_emerge->params;
-                       break;
-               }
-               default:
-                       ; //complain here
-       }
-
+       m_emerge->setParamsToSettings(&params);
        params.writeLines(os);
 
        os<<"[end_of_params]\n";
@@ -3142,37 +3118,19 @@ void ServerMap::loadMapMeta()
                params.parseConfigLine(line);
        }
 
-       m_emerge->mg_version  = params.getS16("mg_version");
-       m_emerge->setMapgenParams();
-
-       m_emerge->params->seed        = params.getU64("seed");
-       m_emerge->params->water_level = params.getS16("water_level");
-       m_emerge->params->chunksize   = params.getS16("chunksize");
-       m_emerge->params->flags       = params.getS32("flags");
-
-       m_seed = m_emerge->params->seed;
-
-       switch (m_emerge->mg_version) {
-               case 6:
-               {
-                       MapgenV6Params *v6params = m_emerge->params;
-
-                       v6params->freq_desert = params.getFloat("freq_desert");
-                       v6params->freq_beach  = params.getFloat("freq_beach");
-
-                       break;
+       MapgenParams *mgparams = m_emerge->getParamsFromSettings(&params);
+       if (mgparams) {
+               if (m_mgparams)
+                       delete m_mgparams;
+               m_mgparams = mgparams;
+               m_seed = mgparams->seed;
+       } else {
+               if (params.exists("seed")) {
+                       m_seed = params.getU64("seed");
+                       m_mgparams->seed = m_seed;
                }
-               case 7:
-               {
-                       MapgenV7Params *v6params = m_emerge->params;
-
-                       break;
-               }
-               default:
-                       ; //complain here
        }
 
-
        verbosestream<<"ServerMap::loadMapMeta(): "<<"seed="<<m_seed<<std::endl;
 }