From 018d941daf310e5f79c4c102d075149ba4dfe50f Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 2 Jun 2012 14:20:22 +0000 Subject: Fixed Linux compilation complaining about min() and max(), hopefully forever. Use std::min() and std::max() git-svn-id: http://mc-server.googlecode.com/svn/trunk@539 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/HeiGen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/HeiGen.cpp') 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: -- cgit v1.2.3