Modernize client code (#6250)

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

diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 71c0b001f71b0bffa7f14194727020b6c160e74d..f0c145934aab7c73b1e7909e4005202ab4372c9c 100644 (file)
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -236,7 +236,9 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
        updateHeightmap(node_min, node_max);
 
        // Place biome-specific nodes and build biomemap
-       MgStoneType stone_type = generateBiomes();
+       MgStoneType mgstone_type;
+       content_t biome_stone;
+       generateBiomes(&mgstone_type, &biome_stone, water_level - 1);
 
        // Cave creation.
        if (flags & MG_CAVES)
@@ -244,14 +246,16 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
 
        // Dungeon creation
        if ((flags & MG_DUNGEONS) && node_max.Y < 50)
-               generateDungeons(stone_surface_max_y, stone_type);
+               generateDungeons(stone_surface_max_y, mgstone_type, biome_stone);
 
        // Generate the registered decorations
        if (flags & MG_DECORATIONS)
-               m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
+               m_emerge->decomgr->placeAllDecos(this, blockseed,
+                       node_min, node_max, water_level - 1);
 
        // Generate the registered ores
-       m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
+       m_emerge->oremgr->placeAllOres(this, blockseed,
+               node_min, node_max, water_level - 1);
 
        // Sprinkle some dust on top after everything else was generated
        dustTopNodes();
@@ -473,7 +477,7 @@ int MapgenValleys::generateTerrain()
        MapNode n_stone(c_stone);
        MapNode n_water(c_water_source);
 
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
        s16 surface_max_y = -MAX_MAP_GENERATION_LIMIT;
        u32 index_2d = 0;
 
@@ -595,7 +599,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y, s16 large_cave_depth)
        MapNode n_lava(c_lava_source);
        MapNode n_water(c_river_water_source);
 
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
 
        // Cave blend distance near YMIN, YMAX
        const float massive_cave_blend = 128.f;