#include "log.h"
#include "map.h"
#include "mapblock.h"
+#include "mapgen_flat.h"
#include "mapgen_fractal.h"
#include "mapgen_v5.h"
#include "mapgen_v6.h"
#include "mapgen_v7.h"
+#include "mapgen_valleys.h"
#include "mapgen_singlenode.h"
#include "mg_biome.h"
#include "mg_ore.h"
{"v5", new MapgenFactoryV5, true},
{"v6", new MapgenFactoryV6, true},
{"v7", new MapgenFactoryV7, true},
- {"fractal", new MapgenFactoryFractal, false},
+ {"flat", new MapgenFactoryFlat, true},
+ {"fractal", new MapgenFactoryFractal, true},
+ {"valleys", new MapgenFactoryValleys, true},
{"singlenode", new MapgenFactorySinglenode, false},
};
Mapgen *EmergeManager::getCurrentMapgen()
{
for (u32 i = 0; i != m_threads.size(); i++) {
- if (m_threads[i]->isSameThread())
+ if (m_threads[i]->isCurrentThread())
return m_threads[i]->m_mapgen;
}
m_emerge(NULL),
m_mapgen(NULL)
{
- name = "Emerge-" + itos(ethreadid);
+ m_name = "Emerge-" + itos(ethreadid);
}