summaryrefslogtreecommitdiff
path: root/src/emerge.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-12-07 23:43:46 -0500
committerkwolekr <kwolekr@minetest.net>2013-12-08 01:31:06 -0500
commit83cc8823354c1c476498ddf35052f403ea247e80 (patch)
treec7bc33296dd6b5b200d0668028556e8c4b68ab2b /src/emerge.h
parentbbae8eb7514be2fef4d3931c3cec37c04c415786 (diff)
downloadminetest-83cc8823354c1c476498ddf35052f403ea247e80.tar.gz
minetest-83cc8823354c1c476498ddf35052f403ea247e80.tar.bz2
minetest-83cc8823354c1c476498ddf35052f403ea247e80.zip
EmergeManager: Fix Lua mapgen override param handling
Diffstat (limited to 'src/emerge.h')
-rw-r--r--src/emerge.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/emerge.h b/src/emerge.h
index d2ab6894d..ed982924b 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -83,21 +83,21 @@ public:
INodeDefManager *ndef;
std::map<std::string, MapgenFactory *> mglist;
-
+
std::vector<Mapgen *> mapgen;
std::vector<EmergeThread *> emergethread;
-
+
//settings
MapgenParams *params;
bool mapgen_debug_info;
u16 qlimit_total;
u16 qlimit_diskonly;
u16 qlimit_generate;
-
+
MapgenParams *luaoverride_params;
u32 luaoverride_params_modified;
u32 luaoverride_flagmask;
-
+
//block emerge queue data structures
JMutex queuemutex;
std::map<v3s16, BlockEmergeData *> blocks_enqueued;
@@ -112,17 +112,18 @@ public:
~EmergeManager();
void initMapgens(MapgenParams *mgparams);
+ MapgenParams *setMapgenType(MapgenParams *mgparams, std::string newname);
Mapgen *getCurrentMapgen();
Mapgen *createMapgen(std::string mgname, int mgid,
MapgenParams *mgparams);
MapgenParams *createMapgenParams(std::string mgname);
void triggerAllThreads();
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-
+
void registerMapgen(std::string name, MapgenFactory *mgfactory);
MapgenParams *getParamsFromSettings(Settings *settings);
void setParamsToSettings(Settings *settings);
-
+
//mapgen helper methods
Biome *getBiomeAtPoint(v3s16 p);
int getGroundLevelAtPoint(v2s16 p);