Add curl, freetype and luaJIT to CMAKE_BUILD_INFO

[dragonfireclient.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index a0276fb591d007ea511655a8eb9e9509ead69e86..14736e3d0fef1a43f38876af0cb97204bf379df3 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -45,35 +45,36 @@ extern NoiseParams nparams_v6_def_apple_trees;
 struct MapgenV6Params : public MapgenParams {
        float freq_desert;
        float freq_beach;
-       NoiseParams *np_terrain_base;
-       NoiseParams *np_terrain_higher;
-       NoiseParams *np_steepness;
-       NoiseParams *np_height_select;
-       NoiseParams *np_mud;
-       NoiseParams *np_beach;
-       NoiseParams *np_biome;
-       NoiseParams *np_cave;
-       NoiseParams *np_humidity;
-       NoiseParams *np_trees;
-       NoiseParams *np_apple_trees;
+       NoiseParams np_terrain_base;
+       NoiseParams np_terrain_higher;
+       NoiseParams np_steepness;
+       NoiseParams np_height_select;
+       NoiseParams np_mud;
+       NoiseParams np_beach;
+       NoiseParams np_biome;
+       NoiseParams np_cave;
+       NoiseParams np_humidity;
+       NoiseParams np_trees;
+       NoiseParams np_apple_trees;
        
        MapgenV6Params() {
                freq_desert       = 0.45;
                freq_beach        = 0.15;
-               np_terrain_base   = &nparams_v6_def_terrain_base;
-               np_terrain_higher = &nparams_v6_def_terrain_higher;
-               np_steepness      = &nparams_v6_def_steepness;
-               np_height_select  = &nparams_v6_def_height_select;
-               np_mud            = &nparams_v6_def_mud;
-               np_beach          = &nparams_v6_def_beach;
-               np_biome          = &nparams_v6_def_biome;
-               np_cave           = &nparams_v6_def_cave;
-               np_humidity       = &nparams_v6_def_humidity;
-               np_trees          = &nparams_v6_def_trees;
-               np_apple_trees    = &nparams_v6_def_apple_trees;
-
+               np_terrain_base   = nparams_v6_def_terrain_base;
+               np_terrain_higher = nparams_v6_def_terrain_higher;
+               np_steepness      = nparams_v6_def_steepness;
+               np_height_select  = nparams_v6_def_height_select;
+               np_mud            = nparams_v6_def_mud;
+               np_beach          = nparams_v6_def_beach;
+               np_biome          = nparams_v6_def_biome;
+               np_cave           = nparams_v6_def_cave;
+               np_humidity       = nparams_v6_def_humidity;
+               np_trees          = nparams_v6_def_trees;
+               np_apple_trees    = nparams_v6_def_apple_trees;
        }
        
+       ~MapgenV6Params() {}
+       
        bool readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
@@ -83,7 +84,6 @@ class MapgenV6 : public Mapgen {
        EmergeManager *emerge;
 
        int ystride;
-       v3s16 csize;
        u32 flags;
 
        u32 blockseed;
@@ -131,7 +131,6 @@ class MapgenV6 : public Mapgen {
        virtual float baseTerrainLevelFromMap(v2s16 p);
        virtual float baseTerrainLevelFromMap(int index);
 
-       s16 find_ground_level(v2s16 p2d);
        s16 find_stone_level(v2s16 p2d);
        bool block_is_underground(u64 seed, v3s16 blockpos);
        s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);