projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show infotext with description for item entities
[oweals/minetest.git]
/
src
/
emerge.cpp
diff --git
a/src/emerge.cpp
b/src/emerge.cpp
index 3532ca29dea40f79feecf14049c127a43c68086c..b188a7f413986e2b4022fca838836f8c1a28d1cf 100644
(file)
--- 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 "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_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"
#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},
{"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},
};
{"singlenode", new MapgenFactorySinglenode, false},
};
@@
-219,7
+223,7
@@
void EmergeManager::initMapgens()
Mapgen *EmergeManager::getCurrentMapgen()
{
for (u32 i = 0; i != m_threads.size(); i++) {
Mapgen *EmergeManager::getCurrentMapgen()
{
for (u32 i = 0; i != m_threads.size(); i++) {
- if (m_threads[i]->is
Same
Thread())
+ if (m_threads[i]->is
Current
Thread())
return m_threads[i]->m_mapgen;
}
return m_threads[i]->m_mapgen;
}
@@
-476,7
+480,7
@@
EmergeThread::EmergeThread(Server *server, int ethreadid) :
m_emerge(NULL),
m_mapgen(NULL)
{
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()
{
void *EmergeThread::run()
{
- DSTACK(
__
FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
BEGIN_DEBUG_EXCEPTION_HANDLER
v3s16 pos;
BEGIN_DEBUG_EXCEPTION_HANDLER
v3s16 pos;
@@
-700,6
+704,6
@@
void *EmergeThread::run()
m_server->setAsyncFatalError(err.str());
}
m_server->setAsyncFatalError(err.str());
}
- END_DEBUG_EXCEPTION_HANDLER
(errorstream)
+ END_DEBUG_EXCEPTION_HANDLER
return NULL;
}
return NULL;
}