Noise: Prevent unittest crash caused by division by zero

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

diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 4a7a11bcc63f415a54f7435b1b69fb99e170cc89..573f598a58fe34a86ab2c94ae76bf491fe41547d 100644 (file)
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -1,8 +1,7 @@
 /*
 Minetest Valleys C
-Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
-Copyright (C) 2010-2015 paramat, Matt Gregory
-Copyright (C) 2016 Duane Robertson <duane@duanerobertson.com>
+Copyright (C) 2016-2017 Duane Robertson <duane@duanerobertson.com>
+Copyright (C) 2016-2017 paramat
 
 Based on Valleys Mapgen by Gael de Sailly
  (https://forum.minetest.net/viewtopic.php?f=9&t=11430)
@@ -47,15 +46,15 @@ class BiomeGenOriginal;
 
 
 struct MapgenValleysParams : public MapgenParams {
-       u32 spflags;
-       s16 large_cave_depth;
-       s16 massive_cave_depth;
-       u16 altitude_chill;
-       u16 lava_features;
-       u16 river_depth;
-       u16 river_size;
-       u16 water_features;
-       float cave_width;
+       u32 spflags = MGVALLEYS_HUMID_RIVERS | MGVALLEYS_ALT_CHILL;
+       s16 large_cave_depth = -33;
+       s16 massive_cave_depth = -256; // highest altitude of massive caves
+       u16 altitude_chill = 90; // The altitude at which temperature drops by 20C.
+       u16 lava_features = 0; // How often water will occur in caves.
+       u16 river_depth = 4; // How deep to carve river channels.
+       u16 river_size = 5; // How wide to make rivers.
+       u16 water_features = 0; // How often water will occur in caves.
+       float cave_width = 0.09f;
        NoiseParams np_cave1;
        NoiseParams np_cave2;
        NoiseParams np_filler_depth;
@@ -124,8 +123,6 @@ private:
        Noise *noise_valley_depth;
        Noise *noise_valley_profile;
 
-       content_t c_lava_source;
-
        float terrainLevelAtPoint(s16 x, s16 z);
 
        void calculateNoise();