diff options
author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-18 15:39:42 +0200 |
---|---|---|
committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-18 15:39:42 +0200 |
commit | 99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda (patch) | |
tree | 937fbf38e19c44ecc0fe7f901916b0f817b6a02a /source/Simulator/FloodyFluidSimulator.cpp | |
parent | Made constants in cChunkDef enums, compilation fixes for gcc. (diff) | |
download | cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.tar cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.tar.gz cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.tar.bz2 cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.tar.lz cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.tar.xz cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.tar.zst cuberite-99c9b2e11d17b9c0d0fa9e62119ed3d13f96beda.zip |
Diffstat (limited to 'source/Simulator/FloodyFluidSimulator.cpp')
-rw-r--r-- | source/Simulator/FloodyFluidSimulator.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/Simulator/FloodyFluidSimulator.cpp b/source/Simulator/FloodyFluidSimulator.cpp index 0f100116d..7d6879e07 100644 --- a/source/Simulator/FloodyFluidSimulator.cpp +++ b/source/Simulator/FloodyFluidSimulator.cpp @@ -42,8 +42,7 @@ void cFloodyFluidSimulator::SimulateBlock(int a_BlockX, int a_BlockY, int a_Bloc cBlockArea Area;
int MinBlockY = std::max(0, a_BlockY - 1);
- int ChunkHeight = cChunkDef::Height; // Stupid compilers wouldn't let me use std::min(cChunkDef::Height, ...)
- int MaxBlockY = std::min(ChunkHeight, a_BlockY + 1);
+ int MaxBlockY = std::min(+cChunkDef::Height, a_BlockY + 1);
if (!Area.Read(m_World, a_BlockX - 1, a_BlockX + 1, MinBlockY, MaxBlockY, a_BlockZ - 1, a_BlockZ + 1))
{
// Cannot read the immediate neighborhood, probably too close to an unloaded chunk. Bail out.
|