diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2014-10-11 19:32:21 +0200 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2014-10-11 19:32:21 +0200 |
| commit | 93833069a80fe4aec33a95148df39ad40671ddaf (patch) | |
| tree | 2e6a335a60e618b5fe456ca8a586a2c5448c8c87 /src/Generating/FinishGen.h | |
| parent | Reverted submodule changes. (diff) | |
| parent | Merge pull request #1528 from kjanku1/master (diff) | |
| download | cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.gz cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.bz2 cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.lz cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.xz cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.zst cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.zip | |
Diffstat (limited to 'src/Generating/FinishGen.h')
| -rw-r--r-- | src/Generating/FinishGen.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h index ed32768b3..4a08d70c8 100644 --- a/src/Generating/FinishGen.h +++ b/src/Generating/FinishGen.h @@ -163,7 +163,7 @@ public: m_Amount(a_Amount) { // Initialize all the block types. - for (int idx = 0; idx < ARRAYCOUNT(m_IsAllowedBelow); ++idx) + for (size_t idx = 0; idx < ARRAYCOUNT(m_IsAllowedBelow); ++idx) { m_IsAllowedBelow[idx] = false; } @@ -175,7 +175,7 @@ public: } // Initialize all the biome types. - for (int idx = 0; idx < ARRAYCOUNT(m_IsBiomeAllowed); ++idx) + for (size_t idx = 0; idx < ARRAYCOUNT(m_IsBiomeAllowed); ++idx) { m_IsBiomeAllowed[idx] = false; } @@ -240,9 +240,14 @@ class cFinishGenPreSimulator : public cFinishGen { public: - cFinishGenPreSimulator(void); + cFinishGenPreSimulator(bool a_PreSimulateFallingBlocks, bool a_PreSimulateWater, bool a_PreSimulateLava); protected: + + bool m_PreSimulateFallingBlocks; + bool m_PreSimulateWater; + bool m_PreSimulateLava; + // Drops hanging sand and gravel down to the ground, recalculates heightmap void CollapseSandGravel( cChunkDef::BlockTypes & a_BlockTypes, // Block types to read and change |