Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / mapgen_v6.cpp

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index d90d142d50ed75d911c1c686ba356a7656934809..e5ff72a609e725200313d7e191884bba9afe3ad5 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -80,18 +80,18 @@ MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
 
        this->ystride = csize.X; //////fix this
 
-       np_cave        = params->np_cave;
-       np_humidity    = params->np_humidity;
-       np_trees       = params->np_trees;
-       np_apple_trees = params->np_apple_trees;
-
-       noise_terrain_base   = new Noise(params->np_terrain_base,   seed, csize.X, csize.Y);
-       noise_terrain_higher = new Noise(params->np_terrain_higher, seed, csize.X, csize.Y);
-       noise_steepness      = new Noise(params->np_steepness,      seed, csize.X, csize.Y);
-       noise_height_select  = new Noise(params->np_height_select,  seed, csize.X, csize.Y);
-       noise_mud            = new Noise(params->np_mud,            seed, csize.X, csize.Y);
-       noise_beach          = new Noise(params->np_beach,          seed, csize.X, csize.Y);
-       noise_biome          = new Noise(params->np_biome,          seed, csize.X, csize.Y);
+       np_cave        = &params->np_cave;
+       np_humidity    = &params->np_humidity;
+       np_trees       = &params->np_trees;
+       np_apple_trees = &params->np_apple_trees;
+
+       noise_terrain_base   = new Noise(&params->np_terrain_base,   seed, csize.X, csize.Y);
+       noise_terrain_higher = new Noise(&params->np_terrain_higher, seed, csize.X, csize.Y);
+       noise_steepness      = new Noise(&params->np_steepness,      seed, csize.X, csize.Y);
+       noise_height_select  = new Noise(&params->np_height_select,  seed, csize.X, csize.Y);
+       noise_mud            = new Noise(&params->np_mud,            seed, csize.X, csize.Y);
+       noise_beach          = new Noise(&params->np_beach,          seed, csize.X, csize.Y);
+       noise_biome          = new Noise(&params->np_biome,          seed, csize.X, csize.Y);
 }