GUIScene: Clear depth buffer + replace deprecated clearZBuffer calls

[dragonfireclient.git] / src / noise.h

diff --git a/src/noise.h b/src/noise.h
index ae97b87406405294d444b88fd1e0ad210cbcb22a..6138798907533f41b1209dcbd797e91f0d8256ad 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
@@ -112,7 +119,7 @@ struct NoiseParams {
 
        NoiseParams() = default;
 
-       NoiseParams(float offset_, float scale_, v3f spread_, s32 seed_,
+       NoiseParams(float offset_, float scale_, const v3f &spread_, s32 seed_,
                u16 octaves_, float persist_, float lacunarity_,
                u32 flags_=NOISE_FLAG_DEFAULTS)
        {
@@ -180,7 +187,8 @@ class Noise {
 private:
        void allocBuffers();
        void resizeNoiseBuf(bool is3d);
-       void updateResults(float g, float *gmap, float *persistence_map, size_t bufsize);
+       void updateResults(float g, float *gmap, const float *persistence_map,
+                       size_t bufsize);
 
 };