Cavegen: Make mgfractal use mgv5 cavegen

Remove CaveFractal
Add a lava depth constant to CaveV5 to make it universal

1 files changed, 4 insertions, 49 deletions

diff --git a/src/cavegen.h b/src/cavegen.h
index 22ee5804d..a1124711b 100644
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -21,17 +21,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CAVEGEN_HEADER
 
 #define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
+#define MGV5_LAVA_DEPTH -256
 #define MGV7_LAVA_DEPTH -256
-#define MGFRACTAL_LAVA_DEPTH -256
 
 class MapgenV5;
 class MapgenV6;
 class MapgenV7;
-class MapgenFractal;
 
 class CaveV5 {
 public:
-	MapgenV5 *mg;
+	Mapgen *mg;
 	MMVManip *vm;
 	INodeDefManager *ndef;
 
@@ -66,9 +65,10 @@ public:
 	content_t c_ice;
 
 	int water_level;
+	int ystride;
 
 	CaveV5() {}
-	CaveV5(MapgenV5 *mg, PseudoRandom *ps);
+	CaveV5(Mapgen *mg, PseudoRandom *ps);
 	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
 	void makeTunnel(bool dirswitch);
 	void carveRoute(v3f vec, float f, bool randomize_xz);
@@ -163,49 +163,4 @@ public:
 	void carveRoute(v3f vec, float f, bool randomize_xz);
 };
 
-class CaveFractal {
-public:
-	MapgenFractal *mg;
-	MMVManip *vm;
-	INodeDefManager *ndef;
-
-	NoiseParams *np_caveliquids;
-
-	s16 min_tunnel_diameter;
-	s16 max_tunnel_diameter;
-	u16 tunnel_routepoints;
-	int dswitchint;
-	int part_max_length_rs;
-
-	bool large_cave_is_flat;
-	bool flooded;
-
-	s16 max_stone_y;
-	v3s16 node_min;
-	v3s16 node_max;
-
-	v3f orp;  // starting point, relative to caved space
-	v3s16 of; // absolute coordinates of caved space
-	v3s16 ar; // allowed route area
-	s16 rs;   // tunnel radius size
-	v3f main_direction;
-
-	s16 route_y_min;
-	s16 route_y_max;
-
-	PseudoRandom *ps;
-
-	content_t c_water_source;
-	content_t c_lava_source;
-	content_t c_ice;
-
-	int water_level;
-
-	CaveFractal() {}
-	CaveFractal(MapgenFractal *mg, PseudoRandom *ps);
-	void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
-	void makeTunnel(bool dirswitch);
-	void carveRoute(v3f vec, float f, bool randomize_xz);
-};
-
 #endif