Fix a memleak pointed by @Zeno- in MeshUpdateQueue

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

diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 7cc6aad5c2cacd18f1990a1ba1a0896bd78c53aa..0a44f71a57d2e80618a6227fea1579c756fc2f55 100644 (file)
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -33,7 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 #include "dungeongen.h"
 #include "cavegen.h"
-#include "treegen.h"
 #include "mg_biome.h"
 #include "mg_ore.h"
 #include "mg_decoration.h"
@@ -49,33 +48,35 @@ FlagDesc flagdesc_mapgen_flat[] = {
 ///////////////////////////////////////////////////////////////////////////////////////
 
 
-MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge)
        : MapgenBasic(mapgenid, params, emerge)
 {
-       MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams;
-
-       this->spflags          = sp->spflags;
-       this->ground_level     = sp->ground_level;
-       this->large_cave_depth = sp->large_cave_depth;
-       this->cave_width       = sp->cave_width;
-       this->lake_threshold   = sp->lake_threshold;
-       this->lake_steepness   = sp->lake_steepness;
-       this->hill_threshold   = sp->hill_threshold;
-       this->hill_steepness   = sp->hill_steepness;
-
-       //// 2D noise
-       noise_terrain      = new Noise(&sp->np_terrain,      seed, csize.X, csize.Z);
-       noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
-
-       MapgenBasic::np_cave1 = sp->np_cave1;
-       MapgenBasic::np_cave2 = sp->np_cave2;
+       this->spflags          = params->spflags;
+       this->ground_level     = params->ground_level;
+       this->large_cave_depth = params->large_cave_depth;
+       this->cave_width       = params->cave_width;
+       this->lake_threshold   = params->lake_threshold;
+       this->lake_steepness   = params->lake_steepness;
+       this->hill_threshold   = params->hill_threshold;
+       this->hill_steepness   = params->hill_steepness;
+
+       // 2D noise
+       noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);
+
+       if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
+               noise_terrain = new Noise(&params->np_terrain, seed, csize.X, csize.Z);
+       // 3D noise
+       MapgenBasic::np_cave1 = params->np_cave1;
+       MapgenBasic::np_cave2 = params->np_cave2;
 }
 
 
 MapgenFlat::~MapgenFlat()
 {
-       delete noise_terrain;
        delete noise_filler_depth;
+
+       if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
+               delete noise_terrain;
 }
 
 
@@ -84,7 +85,7 @@ MapgenFlatParams::MapgenFlatParams()
        spflags          = 0;
        ground_level     = 8;
        large_cave_depth = -33;
-       cave_width       = 0.3;
+       cave_width       = 0.09;
        lake_threshold   = -0.45;
        lake_steepness   = 48.0;
        hill_threshold   = 0.45;
@@ -92,8 +93,8 @@ MapgenFlatParams::MapgenFlatParams()
 
        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(96,  96,  96),  52534, 4, 0.5, 2.0);
-       np_cave2        = NoiseParams(0, 12,  v3f(96,  96,  96),  10325, 4, 0.5, 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);
 }
 
 
@@ -139,7 +140,9 @@ void MapgenFlatParams::writeParams(Settings *settings) const
 int MapgenFlat::getSpawnLevelAtPoint(v2s16 p)
 {
        s16 level_at_point = ground_level;
-       float n_terrain = NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed);
+       float n_terrain = 0.0f;
+       if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS))
+               n_terrain = NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed);
 
        if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) {
                level_at_point = ground_level -