Index: source/cChunkGenerator.cpp
===================================================================
--- source/cChunkGenerator.cpp	(revision 766)
+++ source/cChunkGenerator.cpp	(working copy)
@@ -294,7 +294,7 @@
 
 void cChunkGenerator::InitStructureGens(cIniFile & a_IniFile)
 {
-	AString Structures = a_IniFile.GetValueSet("Generator", "Structures", "Trees,MarbleCaves,OreNests");
+	AString Structures = a_IniFile.GetValueSet("Generator", "Structures", "Trees,Wormnestcaves,OreNests,Ravines");
 
 	AStringVector Str = StringSplit(Structures, ",");
 	for (AStringVector::const_iterator itr = Str.begin(); itr != Str.end(); ++itr)
@@ -340,7 +340,7 @@
 
 void cChunkGenerator::InitFinishGens(cIniFile & a_IniFile)
 {
-	AString Structures = a_IniFile.GetValueSet("Generator", "Finishers", "SprinkleFoliage,Ice,Snow,Lilypads,BottomLava");
+	AString Structures = a_IniFile.GetValueSet("Generator", "Finishers", "SprinkleFoliage,Ice,Snow,Lilypads,BottomLava,Cactus");
 
 	AStringVector Str = StringSplit(Structures, ",");
 	for (AStringVector::const_iterator itr = Str.begin(); itr != Str.end(); ++itr)
@@ -357,6 +357,10 @@
 		{
 			m_FinishGens.push_back(new cFinishGenIce);
 		}
+		else if (NoCaseCompare(*itr, "Cactus") == 0)
+		{
+			m_FinishGens.push_back(new cFinishGenCactus(m_Seed));
+		}
 		else if (NoCaseCompare(*itr, "Lilypads") == 0)
 		{
 			m_FinishGens.push_back(new cFinishGenLilypads(m_Seed));
Index: source/FinishGen.cpp
===================================================================
--- source/FinishGen.cpp	(revision 766)
+++ source/FinishGen.cpp	(working copy)
@@ -5,6 +5,7 @@
 	- cFinishGenSnow
 	- cFinishGenIce
 	- cFinishGenSprinkleFoliage
+	- cFinishGenCactus
 */
 
 #include "Globals.h"
@@ -383,5 +384,69 @@
 }
 
 
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//cFinishGenCactus
 
+int cFinishGenCactus::GetNumCactus(const cChunkDef::BiomeMap & a_BiomeMap)
+{
+	int res = 0;
+	for (int i = 0; i < ARRAYCOUNT(a_BiomeMap); i++)
+	{
+		if (a_BiomeMap[i] == biDesert)
+		{
+			res++;
+		}
+	}  // for i - a_BiomeMap[]
+	return res / 64;
+}
 
+
+
+
+
+void cFinishGenCactus::GenFinish(
+	int a_ChunkX, int a_ChunkZ,
+	cChunkDef::BlockTypes & a_BlockTypes, // Block types to read and change
+	cChunkDef::BlockNibbles & a_BlockMeta, // Block meta to read and change
+	cChunkDef::HeightMap & a_HeightMap, // Height map to read and change by the current data
+	const cChunkDef::BiomeMap & a_BiomeMap, // Biomes to adhere to
+	cEntityList & a_Entities, // Entities may be added or deleted
+	cBlockEntityList & a_BlockEntities // Block entities may be added or deleted
+)
+{
+	// Add Cactus on top of sand surface in Desert
+
+	int NumCactus = GetNumCactus(a_BiomeMap);
+	for (int i = 0; i < NumCactus; i++)
+	{
+		int x = m_Noise.IntNoise3DInt(a_ChunkX + a_ChunkZ, a_ChunkZ, i) % cChunkDef::Width;
+		int z = m_Noise.IntNoise3DInt(a_ChunkX - a_ChunkZ, i, a_ChunkZ) % cChunkDef::Width;
+
+		// Place a Cactus at {x, z} if possible (Desert, empty block, sand below):
+		if (cChunkDef::GetBiome(a_BiomeMap, x, z) != biDesert)
+       if (cChunkDef::GetBiome(a_BiomeMap, x, z) != biDesertHills)
+		{
+			// not swampland
+			continue;
+		}
+		int Height = cChunkDef::GetHeight(a_HeightMap, x, z);
+		if (Height >= cChunkDef::Height)
+		{
+			// Too high up
+			continue;
+		}
+		if (cChunkDef::GetBlock(a_BlockTypes, x, Height + 1, z) != E_BLOCK_AIR)
+		{
+			// not empty block
+			continue;
+		}
+		switch (cChunkDef::GetBlock(a_BlockTypes, x, Height, z))
+		{
+		case E_BLOCK_SAND:
+			{
+				cChunkDef::SetBlock(a_BlockTypes, x, Height + 1, z, E_BLOCK_CACTUS);
+				cChunkDef::SetHeight(a_HeightMap, x, z, Height + 1);
+				break;
+			}
+		}  // switch (GetBlock)
+	}  // for i
+}
\ No newline at end of file
Index: source/FinishGen.h
===================================================================
--- source/FinishGen.h	(revision 766)
+++ source/FinishGen.h	(working copy)
@@ -7,6 +7,7 @@
 	- cFinishGenSprinkleFoliage
 	- cFinishGenLilypads
 	- cFinishGenBottomLava
+	- cFinishGenCactus
 */
 
 
@@ -150,3 +151,28 @@
 
 
 
+class cFinishGenCactus :
+	public cFinishGen
+{
+public:
+	cFinishGenCactus(int a_Seed) :
+		m_Noise(a_Seed)
+	{
+	}
+	
+protected:
+	cNoise m_Noise;
+	
+	int GetNumCactus(const cChunkDef::BiomeMap & a_BiomeMap);
+	
+	// cFinishGen override:
+	virtual void GenFinish(
+		int a_ChunkX, int a_ChunkZ,
+		cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change
+		cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change
+		cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data
+		const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to
+		cEntityList & a_Entities,                // Entities may be added or deleted
+		cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted
+	) override;
+} ;
\ No newline at end of file