1
0

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
This commit is contained in:
madmaxoft@gmail.com
2012-06-02 14:20:22 +00:00
parent 39a59d6806
commit 018d941daf
3 changed files with 7 additions and 10 deletions

View File

@@ -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: