summaryrefslogtreecommitdiff
path: root/src/mapgen
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-11-19 19:59:17 +0000
committerGitHub <noreply@github.com>2019-11-19 19:59:17 +0000
commitb3c245bb46890d2355ba6456062db65eda475e28 (patch)
tree85c7e0b891cf8151509953f59b60669e5f5755eb /src/mapgen
parentc10952b5742ba4364ac7e6fc9f9f2b44c73357b5 (diff)
downloadminetest-b3c245bb46890d2355ba6456062db65eda475e28.tar.gz
minetest-b3c245bb46890d2355ba6456062db65eda475e28.tar.bz2
minetest-b3c245bb46890d2355ba6456062db65eda475e28.zip
Move duplicated mapgen parameters to class MapgenBasic (#9134)
'large_cave_depth', 'dungeon_ymin' and 'dungeon_ymax' are duplicated across many mapgens so should have been in class MapgenBasic from the start.
Diffstat (limited to 'src/mapgen')
-rw-r--r--src/mapgen/mapgen.h3
-rw-r--r--src/mapgen/mapgen_carpathian.h4
-rw-r--r--src/mapgen/mapgen_flat.h3
-rw-r--r--src/mapgen/mapgen_fractal.h4
-rw-r--r--src/mapgen/mapgen_v5.h4
-rw-r--r--src/mapgen/mapgen_v7.h4
-rw-r--r--src/mapgen/mapgen_valleys.h4
7 files changed, 3 insertions, 23 deletions
diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index 11db03538..a44a8dd3b 100644
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -285,4 +285,7 @@ protected:
int large_cave_num_min;
int large_cave_num_max;
float large_cave_flooded;
+ s16 large_cave_depth;
+ s16 dungeon_ymin;
+ s16 dungeon_ymax;
};
diff --git a/src/mapgen/mapgen_carpathian.h b/src/mapgen/mapgen_carpathian.h
index f77ffd1b1..ef49df213 100644
--- a/src/mapgen/mapgen_carpathian.h
+++ b/src/mapgen/mapgen_carpathian.h
@@ -93,10 +93,6 @@ private:
float river_depth;
float valley_width;
- s16 large_cave_depth;
- s16 dungeon_ymin;
- s16 dungeon_ymax;
-
Noise *noise_height1;
Noise *noise_height2;
Noise *noise_height3;
diff --git a/src/mapgen/mapgen_flat.h b/src/mapgen/mapgen_flat.h
index dd6d51f54..2ff87c0db 100644
--- a/src/mapgen/mapgen_flat.h
+++ b/src/mapgen/mapgen_flat.h
@@ -75,13 +75,10 @@ public:
private:
s16 ground_level;
- s16 large_cave_depth;
float lake_threshold;
float lake_steepness;
float hill_threshold;
float hill_steepness;
- s16 dungeon_ymin;
- s16 dungeon_ymax;
Noise *noise_terrain;
};
diff --git a/src/mapgen/mapgen_fractal.h b/src/mapgen/mapgen_fractal.h
index e5cb2c832..0654d0360 100644
--- a/src/mapgen/mapgen_fractal.h
+++ b/src/mapgen/mapgen_fractal.h
@@ -85,10 +85,6 @@ public:
private:
u16 formula;
bool julia;
-
- s16 large_cave_depth;
- s16 dungeon_ymin;
- s16 dungeon_ymax;
u16 fractal;
u16 iterations;
v3f scale;
diff --git a/src/mapgen/mapgen_v5.h b/src/mapgen/mapgen_v5.h
index 4623405a1..ecdcdaf41 100644
--- a/src/mapgen/mapgen_v5.h
+++ b/src/mapgen/mapgen_v5.h
@@ -74,10 +74,6 @@ public:
int generateBaseTerrain();
private:
- s16 large_cave_depth;
- s16 dungeon_ymin;
- s16 dungeon_ymax;
-
Noise *noise_factor;
Noise *noise_height;
Noise *noise_ground;
diff --git a/src/mapgen/mapgen_v7.h b/src/mapgen/mapgen_v7.h
index 85c9b6beb..f23dee61b 100644
--- a/src/mapgen/mapgen_v7.h
+++ b/src/mapgen/mapgen_v7.h
@@ -108,10 +108,6 @@ private:
s16 floatland_level;
s16 shadow_limit;
- s16 large_cave_depth;
- s16 dungeon_ymin;
- s16 dungeon_ymax;
-
Noise *noise_terrain_base;
Noise *noise_terrain_alt;
Noise *noise_terrain_persist;
diff --git a/src/mapgen/mapgen_valleys.h b/src/mapgen/mapgen_valleys.h
index f5a19eaec..be97f0763 100644
--- a/src/mapgen/mapgen_valleys.h
+++ b/src/mapgen/mapgen_valleys.h
@@ -100,10 +100,6 @@ private:
float river_depth_bed;
float river_size_factor;
- s16 large_cave_depth;
- s16 dungeon_ymin;
- s16 dungeon_ymax;
-
Noise *noise_inter_valley_fill;
Noise *noise_inter_valley_slope;
Noise *noise_rivers;