Mapgen: Deduplicate common constructor code

1 files changed, 13 insertions, 18 deletions

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 723f1217f..aee171b48 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -56,9 +56,20 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public MapgenBasic {
 public:
-	int zstride_1u1d;
+	MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	~MapgenV7();
 
-	u32 spflags;
+	virtual void makeChunk(BlockMakeData *data);
+	int getSpawnLevelAtPoint(v2s16 p);
+
+	float baseTerrainLevelAtPoint(s16 x, s16 z);
+	float baseTerrainLevelFromMap(int index);
+	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
+	int generateTerrain();
+	void generateRidgeTerrain();
+
+private:
 	Noise *noise_terrain_base;
 	Noise *noise_terrain_alt;
 	Noise *noise_terrain_persist;
@@ -68,27 +79,11 @@ public:
 	Noise *noise_mountain;
 	Noise *noise_ridge;
 
-	content_t c_lava_source;
-	content_t c_ice;
-
 	content_t c_cobble;
 	content_t c_stair_cobble;
 	content_t c_mossycobble;
 	content_t c_sandstonebrick;
 	content_t c_stair_sandstonebrick;
-
-	MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-	~MapgenV7();
-
-	virtual void makeChunk(BlockMakeData *data);
-	int getSpawnLevelAtPoint(v2s16 p);
-
-	float baseTerrainLevelAtPoint(s16 x, s16 z);
-	float baseTerrainLevelFromMap(int index);
-	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
-	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
-	int generateTerrain();
-	void generateRidgeTerrain();
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {