aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLoïc Blot <loic.blot@unix-experience.fr>2019-03-25 16:38:35 +0100
committerLoïc Blot <nerzhul@users.noreply.github.com>2019-03-31 20:49:39 +0200
commitb3716a03a6d47058b50acfc71c861ecfea5f80ad (patch)
tree613b338e137c1bd5e30c3664eb418f2bd18d00c0 /src
parentab322fc5aa0b81375aa1d5b2e9b0a0872eecb26f (diff)
downloadminetest-b3716a03a6d47058b50acfc71c861ecfea5f80ad.tar.gz
minetest-b3716a03a6d47058b50acfc71c861ecfea5f80ad.tar.bz2
minetest-b3716a03a6d47058b50acfc71c861ecfea5f80ad.zip
EmergeManager::initMapgens use FATAL_ERROR if and drop boolean return
We never handle the boolean return, also init twice is a coding error, not a runtime error
Diffstat (limited to 'src')
-rw-r--r--src/emerge.cpp19
-rw-r--r--src/emerge.h2
2 files changed, 8 insertions, 13 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 0a1852985..9b3394a23 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -184,33 +184,28 @@ EmergeManager::~EmergeManager()
}
-bool EmergeManager::initMapgens(MapgenParams *params)
+void EmergeManager::initMapgens(MapgenParams *params)
{
- if (!m_mapgens.empty())
- return false;
-
- this->mgparams = params;
+ FATAL_ERROR_IF(!m_mapgens.empty(), "mapgen already inited.");
- for (u32 i = 0; i != m_threads.size(); i++) {
- Mapgen *mg = Mapgen::createMapgen(params->mgtype, i, params, this);
- m_mapgens.push_back(mg);
- }
+ mgparams = params;
- return true;
+ for (u32 i = 0; i != m_threads.size(); i++)
+ m_mapgens.push_back(Mapgen::createMapgen(params->mgtype, i, params, this));
}
Mapgen *EmergeManager::getCurrentMapgen()
{
if (!m_threads_active)
- return NULL;
+ return nullptr;
for (u32 i = 0; i != m_threads.size(); i++) {
if (m_threads[i]->isCurrentThread())
return m_threads[i]->m_mapgen;
}
- return NULL;
+ return nullptr;
}
diff --git a/src/emerge.h b/src/emerge.h
index d4a34451d..df849e542 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -117,7 +117,7 @@ public:
~EmergeManager();
DISABLE_CLASS_COPY(EmergeManager);
- bool initMapgens(MapgenParams *mgparams);
+ void initMapgens(MapgenParams *mgparams);
void startThreads();
void stopThreads();