X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Femerge.cpp;h=b188a7f413986e2b4022fca838836f8c1a28d1cf;hb=87291ea44a61614d5bd9efc0657926da3f867b5f;hp=1e40b915a18890b8cf694b0209f9693724f83e93;hpb=6f4d6cb5741d10e10dacc78e264e421bf6a297cf;p=oweals%2Fminetest.git

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 1e40b915a..b188a7f41 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -34,10 +34,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
@@ -105,7 +107,9 @@ MapgenDesc g_reg_mapgens[] = {
 	{"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},
 };
 
@@ -219,7 +223,7 @@ void EmergeManager::initMapgens()
 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;
 	}
 
@@ -476,7 +480,7 @@ EmergeThread::EmergeThread(Server *server, int ethreadid) :
 	m_emerge(NULL),
 	m_mapgen(NULL)
 {
-	name = "Emerge-" + itos(ethreadid);
+	m_name = "Emerge-" + itos(ethreadid);
 }
 
 
@@ -627,7 +631,7 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
 
 void *EmergeThread::run()
 {
-	DSTACK(__FUNCTION_NAME);
+	DSTACK(FUNCTION_NAME);
 	BEGIN_DEBUG_EXCEPTION_HANDLER
 
 	v3s16 pos;