Add initial Decoration support, many misc. improvements & modifications

[dragonfireclient.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 3391098ea9c7d42876cdaa52e65ca62156504c73..d7177862d8bc34468085fbcf4d408fd4d8c29b60 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -30,22 +30,24 @@ extern NoiseParams nparams_v7_def_height_select;
 extern NoiseParams nparams_v7_def_ridge;
 
 struct MapgenV7Params : public MapgenParams {
-       NoiseParams *np_terrain_base;
-       NoiseParams *np_terrain_alt;
-       NoiseParams *np_terrain_mod;
-       NoiseParams *np_terrain_persist;
-       NoiseParams *np_height_select;
-       NoiseParams *np_ridge;
+       NoiseParams np_terrain_base;
+       NoiseParams np_terrain_alt;
+       NoiseParams np_terrain_mod;
+       NoiseParams np_terrain_persist;
+       NoiseParams np_height_select;
+       NoiseParams np_ridge;
        
        MapgenV7Params() {
-               np_terrain_base    = &nparams_v7_def_terrain_base;
-               np_terrain_alt     = &nparams_v7_def_terrain_alt;
-               np_terrain_mod     = &nparams_v7_def_terrain_mod;
-               np_terrain_persist = &nparams_v7_def_terrain_persist;
-               np_height_select   = &nparams_v7_def_height_select;
-               np_ridge           = &nparams_v7_def_ridge;
+               np_terrain_base    = nparams_v7_def_terrain_base;
+               np_terrain_alt     = nparams_v7_def_terrain_alt;
+               np_terrain_mod     = nparams_v7_def_terrain_mod;
+               np_terrain_persist = nparams_v7_def_terrain_persist;
+               np_height_select   = nparams_v7_def_height_select;
+               np_ridge           = nparams_v7_def_ridge;
        }
        
+       ~MapgenV7Params() {}
+       
        bool readParams(Settings *settings);
        void writeParams(Settings *settings);
 };
@@ -65,9 +67,7 @@ class MapgenV7 : public Mapgen {
        v3s16 full_node_min;
        v3s16 full_node_max;
        
-       s16 *heightmap;
        s16 *ridge_heightmap;
-       u8 *biomemap;
        
        Noise *noise_terrain_base;
        Noise *noise_terrain_alt;