Fix EmergeThread hang on exit

[minetest.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index ea82194b85ccca4211797f6de18d51d08d256674..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,7 @@ 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<<")"
@@ -2013,10 +2014,10 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emer
 
        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));
+               m_seed = (((u64)(myrand() & 0xffff) << 0)
+                               | ((u64)(myrand() & 0xffff) << 16)
+                               | ((u64)(myrand() & 0xffff) << 32)
+                               | ((u64)(myrand() & 0xffff) << 48));
                m_mgparams->seed = m_seed;
        }
 
@@ -3078,14 +3079,7 @@ void ServerMap::saveMapMeta()
 
        Settings params;
 
-       params.set("mg_name", m_emerge->params->mg_name);
-       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("mg_flags", m_emerge->params->flags);
-
-       m_emerge->params->writeParams(&params);
-
+       m_emerge->setParamsToSettings(&params);
        params.writeLines(os);
 
        os<<"[end_of_params]\n";