BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Move duplicated mapgen parameters to class MapgenBasic (#9134)

Browse Source 
'large_cave_depth', 'dungeon_ymin' and 'dungeon_ymax' are duplicated across many mapgens so should have been in class MapgenBasic from the start.
This commit is contained in:
Paramat 2019-11-19 19:59:17 +00:00 committed by GitHub
parent c10952b574
commit b3c245bb46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mapgen/mapgen.h
View File

@ -285,4 +285,7 @@ protected:
int large_cave_num_min; int large_cave_num_min;
int large_cave_num_max; int large_cave_num_max;
float large_cave_flooded; float large_cave_flooded;
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
}; };

4
src/mapgen/mapgen_carpathian.h
View File

@ -93,10 +93,6 @@ private:
float river_depth; float river_depth;
float valley_width; float valley_width;
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
Noise *noise_height1; Noise *noise_height1;
Noise *noise_height2; Noise *noise_height2;
Noise *noise_height3; Noise *noise_height3;

3
src/mapgen/mapgen_flat.h
View File

@ -75,13 +75,10 @@ public:
private: private:
s16 ground_level; s16 ground_level;
s16 large_cave_depth;
float lake_threshold; float lake_threshold;
float lake_steepness; float lake_steepness;
float hill_threshold; float hill_threshold;
float hill_steepness; float hill_steepness;
s16 dungeon_ymin;
s16 dungeon_ymax;
Noise *noise_terrain; Noise *noise_terrain;
}; };

4
src/mapgen/mapgen_fractal.h
View File

@ -85,10 +85,6 @@ public:
private: private:
u16 formula; u16 formula;
bool julia; bool julia;
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
u16 fractal; u16 fractal;
u16 iterations; u16 iterations;
v3f scale; v3f scale;

4
src/mapgen/mapgen_v5.h
View File

@ -74,10 +74,6 @@ public:
int generateBaseTerrain(); int generateBaseTerrain();
private: private:
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
Noise *noise_factor; Noise *noise_factor;
Noise *noise_height; Noise *noise_height;
Noise *noise_ground; Noise *noise_ground;

4
src/mapgen/mapgen_v7.h
View File

@ -108,10 +108,6 @@ private:
s16 floatland_level; s16 floatland_level;
s16 shadow_limit; s16 shadow_limit;
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
Noise *noise_terrain_base; Noise *noise_terrain_base;
Noise *noise_terrain_alt; Noise *noise_terrain_alt;
Noise *noise_terrain_persist; Noise *noise_terrain_persist;

4
src/mapgen/mapgen_valleys.h
View File

@ -100,10 +100,6 @@ private:
float river_depth_bed; float river_depth_bed;
float river_size_factor; float river_size_factor;
s16 large_cave_depth;
s16 dungeon_ymin;
s16 dungeon_ymax;
Noise *noise_inter_valley_fill; Noise *noise_inter_valley_fill;
Noise *noise_inter_valley_slope; Noise *noise_inter_valley_slope;
Noise *noise_rivers; Noise *noise_rivers;