Revert all commits up to (including) a704c04f

src/mapgen_v5.h

@@ -23,9 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 
 /////////////////// Mapgen V5 flags
-//#define MGV5_   0x01
-
-class BiomeManager;
+#define MGV5_BLOBS 0x01
 
 extern FlagDesc flagdesc_mapgen_v5[];
 
@@ -38,6 +36,8 @@ struct MapgenV5Params : public MapgenSpecificParams {
 	NoiseParams np_cave1;
 	NoiseParams np_cave2;
 	NoiseParams np_ground;
+	NoiseParams np_crumble;
+	NoiseParams np_wetness;
 
 	MapgenV5Params();
 	~MapgenV5Params() {}
@@ -67,6 +67,8 @@ public:
 	Noise *noise_cave1;
 	Noise *noise_cave2;
 	Noise *noise_ground;
+	Noise *noise_crumble;
+	Noise *noise_wetness;
 	Noise *noise_heat;
 	Noise *noise_humidity;
 
@@ -93,8 +95,9 @@ public:
 	int getGroundLevelAtPoint(v2s16 p);
 	void calculateNoise();
 	int generateBaseTerrain();
-	void generateBiomes(float *heat_map, float *humidity_map);
-	void generateCaves(int max_stone_y);
+	void generateBiomes();
+	void generateCaves();
+	void generateBlobs();
 	void dustTopNodes();
 };