projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New settings tab contain all possible settings
[oweals/minetest.git]
/
src
/
emerge.cpp
diff --git
a/src/emerge.cpp
b/src/emerge.cpp
index 1e40b915a18890b8cf694b0209f9693724f83e93..392a9d81e7cd6835095ef8b4d68086d3b2db1efc 100644
(file)
--- a/
src/emerge.cpp
+++ b/
src/emerge.cpp
@@
-219,7
+219,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
+476,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
+627,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;