mapgen: drop mapgen id from child mapgens.

[oweals/minetest.git] / src / mapgen / cavegen.cpp

diff --git a/src/mapgen/cavegen.cpp b/src/mapgen/cavegen.cpp
index a54d5139df5fd82aed0214fb7adff4924d431a25..e54d76e08e1d74879651b18089d6496051256321 100644 (file)
--- a/src/mapgen/cavegen.cpp
+++ b/src/mapgen/cavegen.cpp
@@ -355,7 +355,7 @@ void CavesRandomWalk::makeCave(MMVManip *vm, v3s16 nmin, v3s16 nmax,
 
        route_y_min = 0;
        // Allow half a diameter + 7 over stone surface
-       route_y_max = -of.Y + max_stone_y + max_tunnel_diameter / 2 + 7;
+       route_y_max = -of.Y + max_stone_height + max_tunnel_diameter / 2 + 7;
 
        // Limit maximum to area
        route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
@@ -497,28 +497,38 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
        v3s16 startp(orp.X, orp.Y, orp.Z);
        startp += of;
 
-       // Get biome at 'startp', use 'node_cave_liquid' if stated, otherwise
-       // fallback to classic behaviour.
+       v3f fp = orp + vec * f;
+       fp.X += 0.1f * ps->range(-10, 10);
+       fp.Z += 0.1f * ps->range(-10, 10);
+       v3s16 cp(fp.X, fp.Y, fp.Z);
+
+       // Get biome at 'cp + of', the absolute centre point of this route
+       v3s16 cpabs = cp + of;
        MapNode liquidnode = CONTENT_IGNORE;
 
        if (bmgn) {
-               Biome *biome = (Biome *)bmgn->calcBiomeAtPoint(startp);
+               Biome *biome = nullptr;
+               if (cpabs.X < node_min.X || cpabs.X > node_max.X ||
+                               cpabs.Z < node_min.Z || cpabs.Z > node_max.Z)
+                       // Point is outside heat and humidity noise maps so use point noise
+                       // calculations.
+                       biome = (Biome *)bmgn->calcBiomeAtPoint(cpabs);
+               else
+                       // Point is inside heat and humidity noise maps so use them
+                       biome = (Biome *)bmgn->getBiomeAtPoint(cpabs);
+
                if (biome->c_cave_liquid != CONTENT_IGNORE)
                        liquidnode = biome->c_cave_liquid;
        }
 
        if (liquidnode == CONTENT_IGNORE) {
+               // Fallback to classic behaviour using point 'startp'
                float nval = NoisePerlin3D(np_caveliquids, startp.X,
                        startp.Y, startp.Z, seed);
                liquidnode = (nval < 0.40f && node_max.Y < lava_depth) ?
                        lavanode : waternode;
        }
 
-       v3f fp = orp + vec * f;
-       fp.X += 0.1f * ps->range(-10, 10);
-       fp.Z += 0.1f * ps->range(-10, 10);
-       v3s16 cp(fp.X, fp.Y, fp.Z);
-
        s16 d0 = -rs / 2;
        s16 d1 = d0 + rs;
        if (randomize_xz) {
@@ -568,9 +578,6 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
                                        else
                                                vm->m_data[i] = airnode;
                                } else {
-                                       if (c == CONTENT_IGNORE)
-                                               continue;
-
                                        vm->m_data[i] = airnode;
                                        vm->m_flags[i] |= VMANIP_FLAG_CAVE;
                                }
@@ -873,7 +880,7 @@ void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz,
                                                vm->m_data[i] = airnode;
                                        }
                                } else {
-                                       if (c == CONTENT_IGNORE || c == CONTENT_AIR)
+                                       if (c == CONTENT_AIR)
                                                continue;
 
                                        vm->m_data[i] = airnode;