luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 09:25:37 +02:00
Code Activity

Caves: Fix shadowing of 'large_cave_depth' to avoid confusion

Browse Source
This commit is contained in:
paramat
2019-11-22 20:37:43 +00:00
committed by Paramat
parent ec5f591014
commit 154080c883
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mapgen/mapgen.cpp
View File

@@ -843,7 +843,7 @@ void MapgenBasic::generateCavesNoiseIntersection(s16 max_stone_y)
} }
void MapgenBasic::generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_depth) void MapgenBasic::generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_ymax)
{ {
if (node_min.Y > max_stone_y) if (node_min.Y > max_stone_y)
return; return;
@@ -858,10 +858,12 @@ void MapgenBasic::generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_depth)
cave.makeCave(vm, node_min, node_max, &ps, false, max_stone_y, heightmap); cave.makeCave(vm, node_min, node_max, &ps, false, max_stone_y, heightmap);
} }
if (node_max.Y > large_cave_depth) if (node_max.Y > large_cave_ymax)
return; return;
// Large randomwalk caves below 'large_cave_depth' // Large randomwalk caves below 'large_cave_ymax'.
// 'large_cave_ymax' can differ from the 'large_cave_depth' mapgen parameter,
// it is set to world base to disable large caves in or near caverns.
u32 num_large_caves = ps.range(large_cave_num_min, large_cave_num_max); u32 num_large_caves = ps.range(large_cave_num_min, large_cave_num_max);
for (u32 i = 0; i < num_large_caves; i++) { for (u32 i = 0; i < num_large_caves; i++) {

2
src/mapgen/mapgen.h
View File

@@ -244,7 +244,7 @@ public:
virtual void generateBiomes(); virtual void generateBiomes();
virtual void dustTopNodes(); virtual void dustTopNodes();
virtual void generateCavesNoiseIntersection(s16 max_stone_y); virtual void generateCavesNoiseIntersection(s16 max_stone_y);
virtual void generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_depth); virtual void generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_ymax);
virtual bool generateCavernsNoise(s16 max_stone_y); virtual bool generateCavernsNoise(s16 max_stone_y);
virtual void generateDungeons(s16 max_stone_y); virtual void generateDungeons(s16 max_stone_y);