Skip to content
Permalink
Browse files

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
  • Loading branch information
nerzhul committed Mar 31, 2019
1 parent ab322fc commit b3716a03a6d47058b50acfc71c861ecfea5f80ad
Showing with 8 additions and 13 deletions.
  1. +7 −12 src/emerge.cpp
  2. +1 −1 src/emerge.h
@@ -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;
}


@@ -117,7 +117,7 @@ class EmergeManager {
~EmergeManager();
DISABLE_CLASS_COPY(EmergeManager);

bool initMapgens(MapgenParams *mgparams);
void initMapgens(MapgenParams *mgparams);

void startThreads();
void stopThreads();

0 comments on commit b3716a0

Please sign in to comment.