Noise: Prevent unittest crash caused by division by zero

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

diff --git a/src/mg_biome.h b/src/mg_biome.h
index 568d0b1acbb45aecfd0861d68cb55e47eafc0b45..854ada5048b30c2cb663c9fb8503ed60e616f770 100644 (file)
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2017 paramat
 
 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
@@ -24,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "noise.h"
 
+class Server;
 class Settings;
 class BiomeManager;
 
@@ -54,11 +56,13 @@ public:
        content_t c_water_top;
        content_t c_water;
        content_t c_river_water;
+       content_t c_riverbed;
        content_t c_dust;
 
        s16 depth_top;
        s16 depth_filler;
        s16 depth_water_top;
+       s16 depth_riverbed;
 
        s16 y_min;
        s16 y_max;
@@ -113,10 +117,10 @@ public:
        virtual Biome *getBiomeAtIndex(size_t index, s16 y) const = 0;
 
        // Result of calcBiomes bulk computation.
-       biome_t *biomemap;
+       biome_t *biomemap = nullptr;
 
 protected:
-       BiomeManager *m_bmgr;
+       BiomeManager *m_bmgr = nullptr;
        v3s16 m_pmin;
        v3s16 m_csize;
 };
@@ -132,8 +136,8 @@ protected:
 
 struct BiomeParamsOriginal : public BiomeParams {
        BiomeParamsOriginal() :
-               np_heat(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0),
-               np_humidity(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0),
+               np_heat(50, 50, v3f(1000.0, 1000.0, 1000.0), 5349, 3, 0.5, 2.0),
+               np_humidity(50, 50, v3f(1000.0, 1000.0, 1000.0), 842, 3, 0.5, 2.0),
                np_heat_blend(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0),
                np_humidity_blend(0, 1.5, v3f(8.0, 8.0, 8.0), 90003, 2, 1.0, 2.0)
        {
@@ -184,7 +188,7 @@ private:
 
 class BiomeManager : public ObjDefManager {
 public:
-       BiomeManager(IGameDef *gamedef);
+       BiomeManager(Server *server);
        virtual ~BiomeManager();
 
        const char *getObjectTitle() const
@@ -221,7 +225,7 @@ public:
        virtual void clear();
 
 private:
-       IGameDef *m_gamedef;
+       Server *m_server;
 
 };