fix integer overflow (fixes #414)

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

diff --git a/src/noise.h b/src/noise.h
index 6e4fedbc4d154f4be032ba61941f28adbc3dee34..670c2eddca014b4c3a488d525872177c9734a2bb 100644 (file)
--- a/src/noise.h
+++ b/src/noise.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,6 +20,45 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NOISE_HEADER
 #define NOISE_HEADER
 
+#include "debug.h"
+
+class PseudoRandom
+{
+public:
+       PseudoRandom(): m_next(0)
+       {
+       }
+       PseudoRandom(int seed): m_next(seed)
+       {
+       }
+       void seed(int seed)
+       {
+               m_next = seed;
+       }
+       // Returns 0...32767
+       int next()
+       {
+               m_next = m_next * 1103515245 + 12345;
+               return((unsigned)(m_next/65536) % 32768);
+       }
+       int range(int min, int max)
+       {
+               if(max-min > 32768/10)
+               {
+                       //dstream<<"WARNING: PseudoRandom::range: max > 32767"<<std::endl;
+                       assert(0);
+               }
+               if(min > max)
+               {
+                       assert(0);
+                       return max;
+               }
+               return (next()%(max-min+1))+min;
+       }
+private:
+       int m_next;
+};
+
 double easeCurve(double t);
  
 // Return value: -1 ... 1
@@ -43,10 +82,11 @@ double noise3d_perlin_abs(double x, double y, double z, int seed,
 
 enum NoiseType
 {
+       NOISE_CONSTANT_ONE,
        NOISE_PERLIN,
        NOISE_PERLIN_ABS,
        NOISE_PERLIN_CONTOUR,
-       NOISE_PERLIN_CONTOUR_FLIP_YZ
+       NOISE_PERLIN_CONTOUR_FLIP_YZ,
 };
 
 struct NoiseParams