Merge pull request #35 from arydevy/patch-1

[dragonfireclient.git] / src / noise.h

diff --git a/src/noise.h b/src/noise.h
index 7b5e83251883a90d1fb5f83a66b5225a3df096d9..854781731b9cc19920e963d5d71e0da167aaf600 100644 (file)
--- a/src/noise.h
+++ b/src/noise.h
@@ -29,6 +29,13 @@
 #include "exceptions.h"
 #include "util/string.h"
 
+#if defined(RANDOM_MIN)
+#undef RANDOM_MIN
+#endif
+#if defined(RANDOM_MAX)
+#undef RANDOM_MAX
+#endif
+
 extern FlagDesc flagdesc_noiseparams[];
 
 // Note: this class is not polymorphic so that its high level of
@@ -139,7 +146,7 @@ class Noise {
        float *persist_buf = nullptr;
        float *result = nullptr;
 
-       Noise(NoiseParams *np, s32 seed, u32 sx, u32 sy, u32 sz=1);
+       Noise(const NoiseParams *np, s32 seed, u32 sx, u32 sy, u32 sz=1);
        ~Noise();
 
        void setSize(u32 sx, u32 sy, u32 sz=1);
@@ -185,8 +192,8 @@ class Noise {
 
 };
 
-float NoisePerlin2D(NoiseParams *np, float x, float y, s32 seed);
-float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed);
+float NoisePerlin2D(const NoiseParams *np, float x, float y, s32 seed);
+float NoisePerlin3D(const NoiseParams *np, float x, float y, float z, s32 seed);
 
 inline float NoisePerlin2D_PO(NoiseParams *np, float x, float xoff,
        float y, float yoff, s32 seed)