diff options
author | kwolekr <kwolekr@minetest.net> | 2014-12-29 21:23:51 -0500 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2014-12-29 21:23:51 -0500 |
commit | ca89e63b27a2548a7615fcf4943c22f88818f6eb (patch) | |
tree | 6e8f0b35321e580d6080a128839406b748b8fc9d /src/emerge.h | |
parent | 5e2753c712e8f65fa50f4889fc1422393ba21413 (diff) | |
download | minetest-ca89e63b27a2548a7615fcf4943c22f88818f6eb.tar.gz minetest-ca89e63b27a2548a7615fcf4943c22f88818f6eb.tar.bz2 minetest-ca89e63b27a2548a7615fcf4943c22f88818f6eb.zip |
Add core.get_mapgen_names() to Main Menu API (and use it)
Also rewrite mapgen registration for static initialization
Diffstat (limited to 'src/emerge.h')
-rw-r--r-- | src/emerge.h | 8 |
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); |