Formspec: textarea with scrollbar improvements

[dragonfireclient.git] / src / mapgen_v5.h

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index b742638cd1d4d0d5ffbeaac28f35870bc2cb8a36..44b0a09e7b148836215c7d89559ac335b86bf6ae 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -18,13 +18,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPGEN_V5_HEADER
-#define MAPGEN_V5_HEADER
+#pragma once
 
 #include "mapgen.h"
 
-#define MGV5_LARGE_CAVE_DEPTH -256
-
 ///////// Mapgen V5 flags
 #define MGV5_CAVERNS 0x01
 
@@ -34,11 +31,13 @@ extern FlagDesc flagdesc_mapgen_v5[];
 
 struct MapgenV5Params : public MapgenParams
 {
-       u32 spflags;
-       float cave_width;
-       s16 cavern_limit;
-       s16 cavern_taper;
-       float cavern_threshold;
+       u32 spflags = MGV5_CAVERNS;
+       float cave_width = 0.125f;
+       s16 large_cave_depth = -256;
+       s16 lava_depth = -256;
+       s16 cavern_limit = -256;
+       s16 cavern_taper = 256;
+       float cavern_threshold = 0.7f;
 
        NoiseParams np_filler_depth;
        NoiseParams np_factor;
@@ -49,7 +48,7 @@ struct MapgenV5Params : public MapgenParams
        NoiseParams np_cavern;
 
        MapgenV5Params();
-       ~MapgenV5Params() {}
+       ~MapgenV5Params() = default;
 
        void readParams(const Settings *settings);
        void writeParams(Settings *settings) const;
@@ -68,9 +67,8 @@ class MapgenV5 : public MapgenBasic
        int generateBaseTerrain();
 
 private:
+       s16 large_cave_depth;
        Noise *noise_factor;
        Noise *noise_height;
        Noise *noise_ground;
 };
-
-#endif