diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-02 16:20:22 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-02 16:20:22 +0200 |
| commit | 018d941daf310e5f79c4c102d075149ba4dfe50f (patch) | |
| tree | abfce0c3c5e968b01a77f75569c074940dad60ae /source/Trees.cpp | |
| parent | Added a cHeiGenCache object for caching generated heightmaps. World generation is now about twice as fast as before Rev 535 :) (diff) | |
| download | cuberite-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 '')
| -rw-r--r-- | source/Trees.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
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)
{
|