diff options
| -rw-r--r-- | src/emerge.cpp | 4 | ||||
| -rw-r--r-- | src/mapgen/mapgen.cpp | 4 | ||||
| -rw-r--r-- | src/mapgen/mapgen.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index 9b3394a23..510e7590f 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -186,12 +186,12 @@ EmergeManager::~EmergeManager() void EmergeManager::initMapgens(MapgenParams *params) { - FATAL_ERROR_IF(!m_mapgens.empty(), "mapgen already inited."); + FATAL_ERROR_IF(!m_mapgens.empty(), "Mapgen already initialised."); mgparams = params; for (u32 i = 0; i != m_threads.size(); i++) - m_mapgens.push_back(Mapgen::createMapgen(params->mgtype, i, params, this)); + m_mapgens.push_back(Mapgen::createMapgen(params->mgtype, params, this)); } diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp index c46ff7c83..bdbbc01f7 100644 --- a/src/mapgen/mapgen.cpp +++ b/src/mapgen/mapgen.cpp @@ -148,8 +148,8 @@ const char *Mapgen::getMapgenName(MapgenType mgtype) } -Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid, - MapgenParams *params, EmergeManager *emerge) +Mapgen *Mapgen::createMapgen(MapgenType mgtype, MapgenParams *params, + EmergeManager *emerge) { switch (mgtype) { case MAPGEN_CARPATHIAN: diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h index b60aea57e..414c011d9 100644 --- a/src/mapgen/mapgen.h +++ b/src/mapgen/mapgen.h @@ -208,8 +208,8 @@ public: // Mapgen management functions static MapgenType getMapgenType(const std::string &mgname); static const char *getMapgenName(MapgenType mgtype); - static Mapgen *createMapgen(MapgenType mgtype, int mgid, - MapgenParams *params, EmergeManager *emerge); + static Mapgen *createMapgen(MapgenType mgtype, MapgenParams *params, + EmergeManager *emerge); static MapgenParams *createMapgenParams(MapgenType mgtype); static void getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden); |