EmergeManager::initMapgens use FATAL_ERROR if and drop boolean return

nerzhul · nerzhul · commit b3716a03a6d4 · 2019-03-31T20:49:39.000+02:00
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
@@ -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
@@ -117,7 +117,7 @@ class EmergeManager {
 	~EmergeManager();
 	DISABLE_CLASS_COPY(EmergeManager);
 
-	bool initMapgens(MapgenParams *mgparams);
+	void initMapgens(MapgenParams *mgparams);
 
 	void startThreads();
 	void stopThreads();

Original file line number	Diff line number	Diff line change
`@@ -184,33 +184,28 @@ EmergeManager::~EmergeManager()`
`184`	`184`	`}`
`185`	`185`
`186`	`186`
`187`		`-bool EmergeManager::initMapgens(MapgenParams *params)`
	`187`	`+void EmergeManager::initMapgens(MapgenParams *params)`
`188`	`188`	`{`
`189`		`- if (!m_mapgens.empty())`
`190`		`- return false;`
`191`		`-`
`192`		`- this->mgparams = params;`
	`189`	`+ FATAL_ERROR_IF(!m_mapgens.empty(), "mapgen already inited.");`
`193`	`190`
`194`		`- for (u32 i = 0; i != m_threads.size(); i++) {`
`195`		`- Mapgen *mg = Mapgen::createMapgen(params->mgtype, i, params, this);`
`196`		`- m_mapgens.push_back(mg);`
`197`		`- }`
	`191`	`+ mgparams = params;`
`198`	`192`
`199`		`- return true;`
	`193`	`+ for (u32 i = 0; i != m_threads.size(); i++)`
	`194`	`+ m_mapgens.push_back(Mapgen::createMapgen(params->mgtype, i, params, this));`
`200`	`195`	`}`
`201`	`196`
`202`	`197`
`203`	`198`	`Mapgen *EmergeManager::getCurrentMapgen()`
`204`	`199`	`{`
`205`	`200`	`if (!m_threads_active)`
`206`		`- return NULL;`
	`201`	`+ return nullptr;`
`207`	`202`
`208`	`203`	`for (u32 i = 0; i != m_threads.size(); i++) {`
`209`	`204`	`if (m_threads[i]->isCurrentThread())`
`210`	`205`	`return m_threads[i]->m_mapgen;`
`211`	`206`	`}`
`212`	`207`
`213`		`- return NULL;`
	`208`	`+ return nullptr;`
`214`	`209`	`}`
`215`	`210`
`216`	`211`