summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorp-mcgowan <mickeymcgowan@shaw.ca>2014-12-02 02:28:46 +0100
committerp-mcgowan <mickeymcgowan@shaw.ca>2014-12-02 02:28:46 +0100
commit3bf111c69e11623947da70520063c57238d67bf0 (patch)
treee5daf17c7bd7ff7421e815bd181f2141234288f5
parentcacti no longer spawn outside of desert variants (diff)
downloadcuberite-3bf111c69e11623947da70520063c57238d67bf0.tar
cuberite-3bf111c69e11623947da70520063c57238d67bf0.tar.gz
cuberite-3bf111c69e11623947da70520063c57238d67bf0.tar.bz2
cuberite-3bf111c69e11623947da70520063c57238d67bf0.tar.lz
cuberite-3bf111c69e11623947da70520063c57238d67bf0.tar.xz
cuberite-3bf111c69e11623947da70520063c57238d67bf0.tar.zst
cuberite-3bf111c69e11623947da70520063c57238d67bf0.zip
-rw-r--r--src/Generating/FinishGen.cpp8
-rw-r--r--src/Generating/FinishGen.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index e09646758..cba45c0a1 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -392,11 +392,11 @@ void cFinishGenSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
-bool cFinishGenSprinkleFoliage::IsDesertVariant(EMCSBiome a_biome)
+bool cFinishGenSprinkleFoliage::IsDesertVariant(EMCSBiome a_Biome)
{
- return a_biome == biDesertHills ||
- a_biome == biDesert ||
- a_biome == biDesertM;
+ return (a_Biome == biDesertHills) ||
+ (a_Biome == biDesert ) ||
+ (a_Biome == biDesertM );
}
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index 16128efa5..dd6a09c6a 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -149,8 +149,8 @@ protected:
/// Tries to place sugarcane at the coords specified, returns true if successful
bool TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ);
- // Checks if biome is a desert to spawn cacti as opposed to just sand
- bool IsDesertVariant(EMCSBiome a_biome);
+ // Returns true is the specified biome is a desert or its variant
+ static bool IsDesertVariant(EMCSBiome a_biome);
// cFinishGen override:
virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;