summaryrefslogtreecommitdiffstats
path: root/source/HeiGen.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-02 16:20:22 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-02 16:20:22 +0200
commit018d941daf310e5f79c4c102d075149ba4dfe50f (patch)
treeabfce0c3c5e968b01a77f75569c074940dad60ae /source/HeiGen.cpp
parentAdded a cHeiGenCache object for caching generated heightmaps. World generation is now about twice as fast as before Rev 535 :) (diff)
downloadcuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.gz
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.bz2
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.lz
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.xz
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.zst
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.zip
Diffstat (limited to 'source/HeiGen.cpp')
-rw-r--r--source/HeiGen.cpp2
1 files changed, 1 insertions, 1 deletions
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: