diff options
| -rw-r--r-- | source/Globals.h | 5 | ||||
| -rw-r--r-- | source/HeiGen.cpp | 2 | ||||
| -rw-r--r-- | source/Trees.cpp | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/source/Globals.h b/source/Globals.h index df72b25a8..78f847e2e 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -89,6 +89,10 @@ typedef short Int16; #define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <winsock2.h>
+
+ // Windows SDK defines min and max macros, messing up with our std::min and std::max usage
+ #undef min
+ #undef max
#else
#include <sys/types.h>
#include <sys/stat.h> // for mkdir
@@ -176,6 +180,7 @@ typedef short Int16; +
/// A generic interface used mainly in ForEach() functions
template <typename Type> class cItemCallback
{
diff --git a/source/HeiGen.cpp b/source/HeiGen.cpp index b2e9e48c8..551ae8804 100644 --- a/source/HeiGen.cpp +++ b/source/HeiGen.cpp @@ -288,7 +288,7 @@ HEIGHTTYPE cHeiGenBiomal::GetHeightAt(int a_RelX, int a_RelZ, int a_ChunkX, int Height += BiomeCounts[i] * (int)(m_GenParam[i].m_BaseHeight + oct1 + oct2 + oct3);
}
int res = (HEIGHTTYPE)(Height / Sum);
- return min(250, max(res, 5));
+ return std::min(250, std::max(res, 5));
}
// No known biome around? Weird. Return a bogus value:
diff --git a/source/Trees.cpp b/source/Trees.cpp index 1259f1edd..7d82c3ef9 100644 --- a/source/Trees.cpp +++ b/source/Trees.cpp @@ -11,14 +11,6 @@ -#ifndef min
- #define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
-
-
-
-
typedef struct
{
int x, z;
@@ -454,7 +446,7 @@ void GetPineTreeImage(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_Noise // LOGD("Generating %d layers of pine leaves, SameSizeMax = %d", NumLeavesLayers, SameSizeMax);
for (int i = 0; i < NumLeavesLayers; ++i)
{
- int LayerSize = min(i, NumLeavesLayers - i + SameSizeMax - 1);
+ int LayerSize = std::min(i, NumLeavesLayers - i + SameSizeMax - 1);
// LOGD("LayerSize %d: %d", i, LayerSize);
if (LayerSize < 0)
{
|