X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen_v7.h;h=c0cfa8c77774c7bccc49d88ba4a62f2ba0f69b38;hb=18cfd89a86af550b3c4663def77a5fac46e895ae;hp=46dd79b6671a388f2d6daaba3df0cf9280cb7bf8;hpb=02805af36ed4f3f11738c5439b5edd9e1db659ea;p=minetest.git

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 46dd79b66..c0cfa8c77 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -82,12 +82,15 @@ class MapgenV7 : public Mapgen {
 
 	Noise *noise_heat;
 	Noise *noise_humidity;
+	Noise *noise_heat_blend;
+	Noise *noise_humidity_blend;
 
 	content_t c_stone;
 	content_t c_water_source;
 	content_t c_lava_source;
 	content_t c_desert_stone;
 	content_t c_ice;
+	content_t c_sandstone;
 
 	content_t c_cobble;
 	content_t c_stair_cobble;
@@ -102,24 +105,24 @@ class MapgenV7 : public Mapgen {
 	int getGroundLevelAtPoint(v2s16 p);
 	Biome *getBiomeAtPoint(v3s16 p);
 
-	float baseTerrainLevelAtPoint(int x, int z);
+	float baseTerrainLevelAtPoint(s16 x, s16 z);
 	float baseTerrainLevelFromMap(int index);
-	bool getMountainTerrainAtPoint(int x, int y, int z);
-	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
+	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
 
 	void calculateNoise();
 
 	virtual int generateTerrain();
-	int generateBaseTerrain();
-	int generateMountainTerrain(int ymax);
+	void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y);
+	int generateMountainTerrain(s16 ymax);
 	void generateRidgeTerrain();
 
-	bool generateBiomes(float *heat_map, float *humidity_map);
+	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
 	void dustTopNodes();
 
 	//void addTopNodes();
 
-	void generateCaves(int max_stone_y);
+	void generateCaves(s16 max_stone_y);
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {