1 files changed, 39 insertions, 6 deletions

diff --git a/src/Generating/BioGen.h b/src/Generating/BioGen.h
index 227ec97d7..22ddfae5c 100644
--- a/src/Generating/BioGen.h
+++ b/src/Generating/BioGen.h
@@ -80,6 +80,36 @@ protected:
 
 
 
+class cBioGenMulticache :
+	public cBiomeGen
+{
+
+	typedef cBiomeGen super;
+
+public:
+	/*
+	a_CacheSize defines the size of each singular cache
+	a_CachesLength defines how many caches are used for the multicache
+	*/
+	cBioGenMulticache(cBiomeGen * a_BioGenToCache, size_t a_CacheSize, size_t a_CachesLength);  // Doesn't take ownership of a_BioGenToCache
+	~cBioGenMulticache();
+
+protected:
+	typedef std::vector<cBiomeGen *> cBiomeGens;
+
+
+	size_t     m_CachesLength;
+	cBiomeGens m_Caches;
+
+
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
+};
+
+
+
+
+
 /// Base class for generators that use a list of available biomes. This class takes care of the list.
 class cBiomeGenList :
 	public cBiomeGen
@@ -255,12 +285,7 @@ protected:
 	/// The Voronoi map that decides biomes inside individual biome groups
 	cVoronoiMap m_VoronoiSmall;
 	
-	/// The noise used to distort the input X coord
-	cPerlinNoise m_DistortX;
-	
-	/// The noise used to distort the inupt Z coord
-	cPerlinNoise m_DistortZ;
-	
+	// The noises used for the distortion:
 	cNoise m_Noise1;
 	cNoise m_Noise2;
 	cNoise m_Noise3;
@@ -268,6 +293,14 @@ protected:
 	cNoise m_Noise5;
 	cNoise m_Noise6;
 
+	// Frequencies and amplitudes for the distortion noises:
+	float m_FreqX1, m_AmpX1;
+	float m_FreqX2, m_AmpX2;
+	float m_FreqX3, m_AmpX3;
+	float m_FreqZ1, m_AmpZ1;
+	float m_FreqZ2, m_AmpZ2;
+	float m_FreqZ3, m_AmpZ3;
+
 
 	// cBiomeGen overrides:
 	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;