Skip to content
Permalink
Browse files

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.
  • Loading branch information
paramat committed Nov 19, 2019
1 parent c10952b commit b3c245bb46890d2355ba6456062db65eda475e28
@@ -285,4 +285,7 @@ class MapgenBasic : public Mapgen {
int large_cave_num_min;
int large_cave_num_max;
float large_cave_flooded;
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
};
@@ -93,10 +93,6 @@ class MapgenCarpathian : public MapgenBasic
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;
@@ -75,13 +75,10 @@ class MapgenFlat : public MapgenBasic

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;
};
@@ -85,10 +85,6 @@ class MapgenFractal : public MapgenBasic
private:
u16 formula;
bool julia;

s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
u16 fractal;
u16 iterations;
v3f scale;
@@ -74,10 +74,6 @@ class MapgenV5 : public MapgenBasic
int generateBaseTerrain();

private:
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;

Noise *noise_factor;
Noise *noise_height;
Noise *noise_ground;
@@ -108,10 +108,6 @@ class MapgenV7 : public MapgenBasic {
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;
@@ -100,10 +100,6 @@ class MapgenValleys : public MapgenBasic {
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;

0 comments on commit b3c245b

Please sign in to comment.
You can’t perform that action at this time.