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

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 0a18529855a3675b5a51368474b3454f7f43630c..9b3394a23bbc02504b384d4575cdd6621bcbdd47 100644 (file)
--- 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 d4a34451dce3b4930edd40da5405b5a2088549e0..df849e54210b397e3487de777036e1fb4cfa0749 100644 (file)
--- 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();