From 765a834cd04473afeb4b86b445dee901e0d0c83c Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 16 Oct 2015 23:43:29 -0400 Subject: 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 --- src/emerge.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/emerge.cpp') 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); } -- cgit v1.2.3