Remove Android makefile ugly make -j hack

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index e81793ff8b5a34d9dc1b7b1ed1ca635eaab0aa44..89153cdb6017be87b1edfc3fd9c106c268658f38 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -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);
 }
 
 
@@ -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)