X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen.h;h=653b79ed82b56adda6519a59847b4a6e5ec9096e;hb=3251e4493846e981b9dc707c635ee5f966f7d40c;hp=a95e1942aeea5d40fdded5eb67c579b068fe736b;hpb=ae929ce2fdcfcfc95cffece35f3d38ea4d96dd9f;p=dragonfireclient.git

diff --git a/src/mapgen.h b/src/mapgen.h
index a95e1942a..653b79ed8 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -124,6 +124,7 @@ struct MapgenParams {
 	s16 chunksize;
 	u64 seed;
 	s16 water_level;
+	s16 mapgen_limit;
 	u32 flags;
 
 	BiomeParams *bparams;
@@ -133,6 +134,7 @@ struct MapgenParams {
 		chunksize(5),
 		seed(0),
 		water_level(1),
+		mapgen_limit(MAX_MAP_GENERATION_LIMIT),
 		flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
 		bparams(NULL)
 	{
@@ -158,6 +160,7 @@ class Mapgen {
 public:
 	s32 seed;
 	int water_level;
+	int mapgen_limit;
 	u32 flags;
 	bool generating;
 	int id;
@@ -240,6 +243,7 @@ class MapgenBasic : public Mapgen {
 	virtual ~MapgenBasic();
 
 	virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
+	virtual bool generateCaverns(s16 max_stone_y);
 	virtual void generateDungeons(s16 max_stone_y, MgStoneType stone_type);
 	virtual MgStoneType generateBiomes();
 	virtual void dustTopNodes();
@@ -257,10 +261,11 @@ class MapgenBasic : public Mapgen {
 
 	// Content required for generateBiomes
 	content_t c_stone;
-	content_t c_water_source;
-	content_t c_river_water_source;
 	content_t c_desert_stone;
 	content_t c_sandstone;
+	content_t c_water_source;
+	content_t c_river_water_source;
+	content_t c_lava_source;
 
 	// Content required for generateDungeons
 	content_t c_cobble;
@@ -268,7 +273,7 @@ class MapgenBasic : public Mapgen {
 	content_t c_mossycobble;
 	content_t c_stair_desert_stone;
 	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
+	content_t c_stair_sandstone_block;
 
 	int ystride;
 	int zstride;
@@ -279,7 +284,11 @@ class MapgenBasic : public Mapgen {
 
 	NoiseParams np_cave1;
 	NoiseParams np_cave2;
+	NoiseParams np_cavern;
 	float cave_width;
+	float cavern_limit;
+	float cavern_taper;
+	float cavern_threshold;
 };
 
 #endif