Noise: Prevent unittest crash caused by division by zero

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

diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index afe67b04e449b46a6e724dfa779a35321fccbd35..7c2929d39ffa6c24704cdfb8e38ac4eea09fe58f 100644 (file)
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -1,7 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
-Copyright (C) 2010-2015 paramat, Matt Gregory
+Copyright (C) 2015-2017 paramat
+Copyright (C) 2015-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -31,16 +31,17 @@ class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_flat[];
 
-
-struct MapgenFlatParams : public MapgenSpecificParams {
-       u32 spflags;
-       s16 ground_level;
-       s16 large_cave_depth;
-       float cave_width;
-       float lake_threshold;
-       float lake_steepness;
-       float hill_threshold;
-       float hill_steepness;
+struct MapgenFlatParams : public MapgenParams
+{
+       u32 spflags = 0;
+       s16 ground_level = 8;
+       s16 large_cave_depth = -33;
+       s16 lava_depth = -256;
+       float cave_width = 0.09f;
+       float lake_threshold = -0.45f;
+       float lake_steepness = 48.0f;
+       float hill_threshold = 0.45f;
+       float hill_steepness = 64.0f;
        NoiseParams np_terrain;
        NoiseParams np_filler_depth;
        NoiseParams np_cave1;
@@ -53,11 +54,14 @@ struct MapgenFlatParams : public MapgenSpecificParams {
        void writeParams(Settings *settings) const;
 };
 
-class MapgenFlat : public MapgenBasic {
+class MapgenFlat : public MapgenBasic
+{
 public:
-       MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge);
        ~MapgenFlat();
 
+       virtual MapgenType getType() const { return MAPGEN_FLAT; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
        s16 generateTerrain();
@@ -72,16 +76,4 @@ private:
        Noise *noise_terrain;
 };
 
-struct MapgenFactoryFlat : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenFlat(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenFlatParams();
-       };
-};
-
 #endif