Mgv7: Always carve river channels in mountain terrain

[oweals/minetest.git] / src / mapgen_v7.cpp

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 29c81e8a7d2495c6d1de2830a4a90ef8098dab29..7327facaef1c82b5a6ce048d3185ea2b64f8e1ae 100644 (file)
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -74,23 +74,6 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
 
        MapgenBasic::np_cave1 = sp->np_cave1;
        MapgenBasic::np_cave2 = sp->np_cave2;
-
-       // Content used for dungeon generation
-       c_cobble               = ndef->getId("mapgen_cobble");
-       c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-       c_mossycobble          = ndef->getId("mapgen_mossycobble");
-       c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-       c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-
-       // Fall back to more basic content if not defined
-       if (c_mossycobble == CONTENT_IGNORE)
-               c_mossycobble = c_cobble;
-       if (c_stair_cobble == CONTENT_IGNORE)
-               c_stair_cobble = c_cobble;
-       if (c_sandstonebrick == CONTENT_IGNORE)
-               c_sandstonebrick = c_sandstone;
-       if (c_stair_sandstonebrick == CONTENT_IGNORE)
-               c_stair_sandstonebrick = c_sandstone;
 }
 
 
@@ -223,13 +206,15 @@ void MapgenV7::makeChunk(BlockMakeData *data)
 
        blockseed = getBlockSeed2(full_node_min, seed);
 
-       // Generate terrain and ridges with initial heightmaps
+       // Generate base and mountain terrain
+       // An initial heightmap is no longer created here for use in generateRidgeTerrain()
        s16 stone_surface_max_y = generateTerrain();
 
+       // Generate rivers
        if (spflags & MGV7_RIDGES)
                generateRidgeTerrain();
 
-       // Update heightmap to include mountain terrain
+       // Create heightmap
        updateHeightmap(node_min, node_max);
 
        // Init biome generator, place biome-specific nodes, and build biomemap
@@ -240,48 +225,8 @@ void MapgenV7::makeChunk(BlockMakeData *data)
        if (flags & MG_CAVES)
                generateCaves(stone_surface_max_y, water_level);
 
-       if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
-               DungeonParams dp;
-
-               dp.np_rarity  = nparams_dungeon_rarity;
-               dp.np_density = nparams_dungeon_density;
-               dp.np_wetness = nparams_dungeon_wetness;
-               dp.c_water    = c_water_source;
-               if (stone_type == MGSTONE_STONE) {
-                       dp.c_cobble = c_cobble;
-                       dp.c_moss   = c_mossycobble;
-                       dp.c_stair  = c_stair_cobble;
-
-                       dp.diagonal_dirs = false;
-                       dp.mossratio     = 3.0;
-                       dp.holesize      = v3s16(1, 2, 1);
-                       dp.roomsize      = v3s16(0, 0, 0);
-                       dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == MGSTONE_DESERT_STONE) {
-                       dp.c_cobble = c_desert_stone;
-                       dp.c_moss   = c_desert_stone;
-                       dp.c_stair  = c_desert_stone;
-
-                       dp.diagonal_dirs = true;
-                       dp.mossratio     = 0.0;
-                       dp.holesize      = v3s16(2, 3, 2);
-                       dp.roomsize      = v3s16(2, 5, 2);
-                       dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == MGSTONE_SANDSTONE) {
-                       dp.c_cobble = c_sandstonebrick;
-                       dp.c_moss   = c_sandstonebrick;
-                       dp.c_stair  = c_sandstonebrick;
-
-                       dp.diagonal_dirs = false;
-                       dp.mossratio     = 0.0;
-                       dp.holesize      = v3s16(2, 2, 2);
-                       dp.roomsize      = v3s16(2, 0, 2);
-                       dp.notifytype    = GENNOTIFY_DUNGEON;
-               }
-
-               DungeonGen dgen(this, &dp);
-               dgen.generate(blockseed, full_node_min, full_node_max);
-       }
+       if (flags & MG_DUNGEONS)
+               generateDungeons(stone_surface_max_y, stone_type);
 
        // Generate the registered decorations
        if (flags & MG_DECORATIONS)
@@ -388,7 +333,6 @@ int MapgenV7::generateTerrain()
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
                s16 surface_y = baseTerrainLevelFromMap(index2d);
-               heightmap[index2d] = surface_y;  // Create base terrain heightmap
 
                if (surface_y > stone_surface_max_y)
                        stone_surface_max_y = surface_y;
@@ -439,9 +383,6 @@ void MapgenV7::generateRidgeTerrain()
                for (s16 x = node_min.X; x <= node_max.X; x++, index++, vi++) {
                        int j = (z - node_min.Z) * csize.X + (x - node_min.X);
 
-                       if (heightmap[j] < water_level - 16)  // Use base terrain heightmap
-                               continue;
-
                        float uwatern = noise_ridge_uwater->result[j] * 2;
                        if (fabs(uwatern) > width)
                                continue;