Fix comments

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 9b3394a23bbc02504b384d4575cdd6621bcbdd47..510e7590f575647c7077072fa8cac7306f3ed14b 100644 (file)
--- 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 c46ff7c83d8dcfd747035e1d67a05d24f7ff77b3..bdbbc01f76b774bc26074a524babde87391e07ee 100644 (file)
--- 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 b60aea57e261dd5fa8796d2a9f97cef38ea6caf8..414c011d964245eda8bdfc0f3e3212dbba01f3b3 100644 (file)
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -208,8 +208,8 @@ class Mapgen {
        // 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);