summaryrefslogtreecommitdiff
path: root/src/emerge.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emerge.h')
-rw-r--r--src/emerge.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/emerge.h b/src/emerge.h
index 5c84c70f9..e5d1b68b2 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -70,8 +70,6 @@ class EmergeManager {
public:
INodeDefManager *ndef;
- std::map<std::string, MapgenFactory *> mglist;
-
std::vector<Mapgen *> mapgen;
std::vector<EmergeThread *> emergethread;
@@ -105,14 +103,14 @@ public:
void loadMapgenParams();
void initMapgens();
Mapgen *getCurrentMapgen();
- Mapgen *createMapgen(std::string mgname, int mgid,
+ Mapgen *createMapgen(const std::string &mgname, int mgid,
MapgenParams *mgparams);
- MapgenSpecificParams *createMapgenParams(std::string mgname);
+ MapgenSpecificParams *createMapgenParams(const std::string &mgname);
+ static void getMapgenNames(std::list<const char *> &mgnames);
void startThreads();
void stopThreads();
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
- void registerMapgen(std::string name, MapgenFactory *mgfactory);
void loadParamsFromSettings(Settings *settings);
void saveParamsToSettings(Settings *settings);