#include "profiler.h"
#include "log.h"
#include "nodedef.h"
-#include "biome.h"
+#include "mg_biome.h"
+#include "mg_ore.h"
+#include "mg_decoration.h"
+#include "mg_schematic.h"
+#include "mapgen_v5.h"
#include "mapgen_v6.h"
#include "mapgen_v7.h"
#include "mapgen_singlenode.h"
EmergeManager::EmergeManager(IGameDef *gamedef) {
//register built-in mapgens
+ registerMapgen("v5", new MapgenFactoryV5());
registerMapgen("v6", new MapgenFactoryV6());
registerMapgen("v7", new MapgenFactoryV7());
registerMapgen("singlenode", new MapgenFactorySinglenode());
- this->ndef = gamedef->getNodeDefManager();
- this->biomedef = new BiomeDefManager(gamedef->getNodeDefManager()->getResolver());
- this->gennotify = 0;
+ this->ndef = gamedef->getNodeDefManager();
+ this->biomemgr = new BiomeManager(gamedef);
+ this->oremgr = new OreManager(gamedef);
+ this->decomgr = new DecorationManager(gamedef);
+ this->schemmgr = new SchematicManager(gamedef);
+ this->gen_notify_on = 0;
// Note that accesses to this variable are not synchronized.
// This is because the *only* thread ever starting or stopping
emergethread.clear();
mapgen.clear();
- for (unsigned int i = 0; i < ores.size(); i++)
- delete ores[i];
- ores.clear();
-
- for (unsigned int i = 0; i < decorations.size(); i++)
- delete decorations[i];
- decorations.clear();
-
- for (std::map<std::string, MapgenFactory *>::iterator it = mglist.begin();
- it != mglist.end(); ++it) {
+ std::map<std::string, MapgenFactory *>::iterator it;
+ for (it = mglist.begin(); it != mglist.end(); ++it)
delete it->second;
- }
mglist.clear();
- delete biomedef;
+ delete biomemgr;
+ delete oremgr;
+ delete decomgr;
+ delete schemmgr;
if (params.sparams) {
delete params.sparams;
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);
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);