summaryrefslogtreecommitdiff
path: root/src/emerge.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-10-16 23:43:29 -0400
committerkwolekr <kwolekr@minetest.net>2015-10-16 23:43:29 -0400
commit765a834cd04473afeb4b86b445dee901e0d0c83c (patch)
treeb18e7147fb96fc6b352b1c52690315e82b36de82 /src/emerge.cpp
parent6be74d17df75714066b36cfa6ae40081526ef477 (diff)
downloadminetest-765a834cd04473afeb4b86b445dee901e0d0c83c.tar.gz
minetest-765a834cd04473afeb4b86b445dee901e0d0c83c.tar.bz2
minetest-765a834cd04473afeb4b86b445dee901e0d0c83c.zip
Refactor Thread class to improve readability and portability
- Fix some incompatibilities with obscure platforms (AIX and WinCE) - Clean up Thread class interface - Add m_ prefix to private member variables - Simplify platform-dependent logic, reducing preprocessor conditional clauses and improving readibility - Add Thread class documentation
Diffstat (limited to 'src/emerge.cpp')
-rw-r--r--src/emerge.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 21f17cb0e..392a9d81e 100644
--- 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++) {
- if (m_threads[i]->isSameThread())
+ if (m_threads[i]->isCurrentThread())
return m_threads[i]->m_mapgen;
}
@@ -476,7 +476,7 @@ EmergeThread::EmergeThread(Server *server, int ethreadid) :
m_emerge(NULL),
m_mapgen(NULL)
{
- name = "Emerge-" + itos(ethreadid);
+ m_name = "Emerge-" + itos(ethreadid);
}