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 923f85a0fa96e3e4e57fc5026226798b2166d238..09e6e54c2805eb28eee7311a826e22826fa8474b 100644 (file)
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -64,8 +64,6 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
        this->heightmap = new s16[csize.X * csize.Z];
        this->ridge_heightmap = new s16[csize.X * csize.Z];
 
-       initHeightMap(this->heightmap, csize.X * csize.Z);
-
        MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
        this->spflags = sp->spflags;
 
@@ -144,7 +142,7 @@ MapgenV7Params::MapgenV7Params()
 }
 
 
-void MapgenV7Params::readParams(Settings *settings)
+void MapgenV7Params::readParams(const Settings *settings)
 {
        settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7);
 
@@ -162,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);