Heightmaps: Fix uninitialised values in mgv5/mgv6. findGroundLevel: Return -MAP_GENER...

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

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 29d311575d99c669df58d59c906e67fb41530bc7..09e6e54c2805eb28eee7311a826e22826fa8474b 100644 (file)
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -142,7 +142,7 @@ MapgenV7Params::MapgenV7Params()
 }
 
 
-void MapgenV7Params::readParams(Settings *settings)
+void MapgenV7Params::readParams(const Settings *settings)
 {
        settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7);
 
@@ -160,7 +160,7 @@ void MapgenV7Params::readParams(Settings *settings)
 }
 
 
-void MapgenV7Params::writeParams(Settings *settings)
+void MapgenV7Params::writeParams(Settings *settings) const
 {
        settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, (u32)-1);
 
@@ -210,6 +210,7 @@ int MapgenV7::getGroundLevelAtPoint(v2s16 p)
 
 void MapgenV7::makeChunk(BlockMakeData *data)
 {
+       // Pre-conditions
        assert(data->vmanip);
        assert(data->nodedef);
        assert(data->blockpos_requested.X >= data->blockpos_min.X &&
@@ -790,7 +791,7 @@ void MapgenV7::generateCaves(int max_stone_y)
        PseudoRandom ps(blockseed + 21343);
        u32 bruises_count = (ps.range(1, 5) == 1) ? ps.range(1, 2) : 0;
        for (u32 i = 0; i < bruises_count; i++) {
-               CaveV7 cave(this, &ps, true);
+               CaveV7 cave(this, &ps);
                cave.makeCave(node_min, node_max, max_stone_y);
        }
 }