oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

EmergeManager::initMapgens use FATAL_ERROR if and drop boolean return

Browse source 
We never handle the boolean return, also init twice is a coding error, not a runtime error
This commit is contained in:
Loïc Blot 2019-03-25 16:38:35 +01:00 • committed by Loïc Blot
parent ab322fc5aa
commit b3716a03a6
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/emerge.cpp
View file

@ -184,33 +184,28 @@ EmergeManager::~EmergeManager()
}
bool EmergeManager::initMapgens(MapgenParams *params)
void EmergeManager::initMapgens(MapgenParams *params)
{
if (!m_mapgens.empty())
return false;
FATAL_ERROR_IF(!m_mapgens.empty(), "mapgen already inited.");
this->mgparams = params;
mgparams = params;
for (u32 i = 0; i != m_threads.size(); i++) {
Mapgen *mg = Mapgen::createMapgen(params->mgtype, i, params, this);
m_mapgens.push_back(mg);
}
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;
}