Lint fix

[minetest.git] / src / mapgen_flat.cpp

diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 56dca1f06d4608d669f22083f4ed5595aa2657d3..57c20d4703f1d9792ae358d83a2cb517b2e002d4 100644 (file)
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -81,12 +81,12 @@ MapgenFlat::~MapgenFlat()
 }
 
 
-MapgenFlatParams::MapgenFlatParams()
+MapgenFlatParams::MapgenFlatParams():
+       np_terrain      (0, 1,   v3f(600, 600, 600), 7244,  5, 0.6, 2.0),
+       np_filler_depth (0, 1.2, v3f(150, 150, 150), 261,   3, 0.7, 2.0),
+       np_cave1        (0, 12,  v3f(61,  61,  61),  52534, 3, 0.5, 2.0),
+       np_cave2        (0, 12,  v3f(67,  67,  67),  10325, 3, 0.5, 2.0)
 {
-       np_terrain      = NoiseParams(0, 1,   v3f(600, 600, 600), 7244,  5, 0.6, 2.0);
-       np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261,   3, 0.7, 2.0);
-       np_cave1        = NoiseParams(0, 12,  v3f(61,  61,  61),  52534, 3, 0.5, 2.0);
-       np_cave2        = NoiseParams(0, 12,  v3f(67,  67,  67),  10325, 3, 0.5, 2.0);
 }
 
 
@@ -148,10 +148,11 @@ int MapgenFlat::getSpawnLevelAtPoint(v2s16 p)
 
        if (ground_level < water_level)  // Ocean world, allow spawn in water
                return MYMAX(level_at_point, water_level);
-       else if (level_at_point > water_level)
+
+       if (level_at_point > water_level)
                return level_at_point;  // Spawn on land
-       else
-               return MAX_MAP_GENERATION_LIMIT;  // Unsuitable spawn point
+
+       return MAX_MAP_GENERATION_LIMIT;  // Unsuitable spawn point
 }
 
 
@@ -189,22 +190,23 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
 
        // Init biome generator, place biome-specific nodes, and build biomemap
        biomegen->calcBiomeNoise(node_min);
-       MgStoneType stone_type = generateBiomes(water_level - 1);
+
+       MgStoneType mgstone_type;
+       content_t biome_stone;
+       generateBiomes(&mgstone_type, &biome_stone);
 
        if (flags & MG_CAVES)
                generateCaves(stone_surface_max_y, large_cave_depth);
 
        if (flags & MG_DUNGEONS)
-               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, water_level - 1);
+               m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
 
        // Generate the registered ores
-       m_emerge->oremgr->placeAllOres(this, blockseed,
-               node_min, node_max, water_level - 1);
+       m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
 
        // Sprinkle some dust on top after everything else was generated
        dustTopNodes();
@@ -230,7 +232,7 @@ s16 MapgenFlat::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 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
        u32 ni2d = 0;