diff options
| author | STRWarrior <niels.breuker@hotmail.nl> | 2014-07-30 13:06:48 +0200 |
|---|---|---|
| committer | STRWarrior <niels.breuker@hotmail.nl> | 2014-07-30 13:06:48 +0200 |
| commit | 75b7c3775528ced647eb5d7db3437d2856e01e7e (patch) | |
| tree | a95287760ecf9f14bea09fed86cbc024be0937b2 /src/Generating/FinishGen.cpp | |
| parent | Merged branch 'howaner/Options'. (diff) | |
| download | cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.tar cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.tar.gz cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.tar.bz2 cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.tar.lz cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.tar.xz cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.tar.zst cuberite-75b7c3775528ced647eb5d7db3437d2856e01e7e.zip | |
Diffstat (limited to 'src/Generating/FinishGen.cpp')
| -rw-r--r-- | src/Generating/FinishGen.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp index f53addb68..e8324095e 100644 --- a/src/Generating/FinishGen.cpp +++ b/src/Generating/FinishGen.cpp @@ -555,7 +555,10 @@ void cFinishGenBottomLava::GenFinish(cChunkDesc & a_ChunkDesc) //////////////////////////////////////////////////////////////////////////////// // cFinishGenPreSimulator: -cFinishGenPreSimulator::cFinishGenPreSimulator(void) +cFinishGenPreSimulator::cFinishGenPreSimulator(bool a_PreSimulateFallingBlocks, bool a_PreSimulateWater, bool a_PreSimulateLava) : + m_PreSimulateFallingBlocks(a_PreSimulateFallingBlocks), + m_PreSimulateWater(a_PreSimulateWater), + m_PreSimulateLava(a_PreSimulateLava) { // Nothing needed yet } @@ -566,9 +569,20 @@ cFinishGenPreSimulator::cFinishGenPreSimulator(void) void cFinishGenPreSimulator::GenFinish(cChunkDesc & a_ChunkDesc) { - CollapseSandGravel(a_ChunkDesc.GetBlockTypes(), a_ChunkDesc.GetHeightMap()); - StationarizeFluid(a_ChunkDesc.GetBlockTypes(), a_ChunkDesc.GetHeightMap(), E_BLOCK_WATER, E_BLOCK_STATIONARY_WATER); - StationarizeFluid(a_ChunkDesc.GetBlockTypes(), a_ChunkDesc.GetHeightMap(), E_BLOCK_LAVA, E_BLOCK_STATIONARY_LAVA); + if (m_PreSimulateFallingBlocks) + { + CollapseSandGravel(a_ChunkDesc.GetBlockTypes(), a_ChunkDesc.GetHeightMap()); + } + + if (m_PreSimulateWater) + { + StationarizeFluid(a_ChunkDesc.GetBlockTypes(), a_ChunkDesc.GetHeightMap(), E_BLOCK_WATER, E_BLOCK_STATIONARY_WATER); + } + + if (m_PreSimulateLava) + { + StationarizeFluid(a_ChunkDesc.GetBlockTypes(), a_ChunkDesc.GetHeightMap(), E_BLOCK_LAVA, E_BLOCK_STATIONARY_LAVA); + } // TODO: other operations } |