Skip to content
Permalink
Browse files

Caves: Fix shadowing of 'large_cave_depth' to avoid confusion

  • Loading branch information
paramat committed Nov 22, 2019
1 parent ec5f591 commit 154080c8836942e438124af35cfc57ef1f304e73
Showing with 6 additions and 4 deletions.
  1. +5 −3 src/mapgen/mapgen.cpp
  2. +1 −1 src/mapgen/mapgen.h
@@ -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)
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);
}

if (node_max.Y > large_cave_depth)
if (node_max.Y > large_cave_ymax)
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);

for (u32 i = 0; i < num_large_caves; i++) {
@@ -244,7 +244,7 @@ class MapgenBasic : public Mapgen {
virtual void generateBiomes();
virtual void dustTopNodes();
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 void generateDungeons(s16 max_stone_y);

0 comments on commit 154080c

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