From aff537e7141952f743d6536c8e66d54374d1c2ba Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 10:13:43 +0100
Subject: Added type to block type enum.

---
 src/BlockID.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/BlockID.h b/src/BlockID.h
index bb06722d2..b0cdc2a00 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -1,7 +1,13 @@
 #pragma once
 
+// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua pocess the values.
+// ToLua doesn't understand typed enums, so we use preprocessor to hide it from ToLua
+
+enum ENUM_BLOCK_ID : BLOCKTYPE
+#if 0
+enum ENUM_BLOCK_ID  // tolua_export
+#endif
 // tolua_begin
-enum ENUM_BLOCK_ID
 {
 	E_BLOCK_AIR = 0,
 	E_BLOCK_STONE = 1,
@@ -221,6 +227,10 @@ enum ENUM_BLOCK_ID
 };
 // tolua_end
 
+
+
+
+
 // tolua_begin
 enum ENUM_ITEM_ID
 {
-- 
cgit v1.2.3


From ec8c05066600b6c9744f8e9e61650505992bf63f Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 18:17:04 +0100
Subject: Added IsBiomeVeryCold() and IsBiomeCold() functions.

---
 src/BiomeDef.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/BiomeDef.h   |  9 ++++++++
 2 files changed, 71 insertions(+)

(limited to 'src')

diff --git a/src/BiomeDef.cpp b/src/BiomeDef.cpp
index 02f8c2232..188e06173 100644
--- a/src/BiomeDef.cpp
+++ b/src/BiomeDef.cpp
@@ -160,3 +160,65 @@ bool IsBiomeNoDownfall(EMCSBiome a_Biome)
 		}
 	}
 }
+
+
+
+
+
+bool IsBiomeVeryCold(EMCSBiome a_Biome)
+{
+	switch (a_Biome)
+	{
+		case biFrozenOcean:
+		case biFrozenRiver:
+		case biIcePlains:
+		case biIceMountains:
+		case biColdBeach:
+		case biColdTaiga:
+		case biColdTaigaHills:
+		case biIcePlainsSpikes:
+		case biColdTaigaM:
+		{
+			return true;
+		}
+		default:
+		{
+			return false;
+		}
+	}
+}
+
+
+
+
+bool IsBiomeCold(EMCSBiome a_Biome)
+{
+	switch (a_Biome)
+	{
+		case biExtremeHills:
+		case biTaiga:
+		case biTaigaHills:
+		case biExtremeHillsEdge:
+		case biStoneBeach:
+		case biMegaTaiga:
+		case biMegaTaigaHills:
+		case biExtremeHillsPlus:
+		case biExtremeHillsM:
+		case biTaigaM:
+		case biColdTaigaM:
+		case biMegaSpruceTaiga:
+		case biMegaSpruceTaigaHills:
+		case biExtremeHillsPlusM:
+		{
+			return true;
+		}
+		default:
+		{
+			return false;
+		}
+	}
+}
+
+
+
+
diff --git a/src/BiomeDef.h b/src/BiomeDef.h
index f929596e9..dfab50663 100644
--- a/src/BiomeDef.h
+++ b/src/BiomeDef.h
@@ -113,5 +113,14 @@ extern AString BiomeToString(int a_Biome);
 /** Returns true if the biome has no downfall - deserts and savannas */
 extern bool IsBiomeNoDownfall(EMCSBiome a_Biome);
 
+/** Returns true if the biome is very cold
+(has snow on ground everywhere, turns top water to ice, has snowfall instead of rain everywhere).
+Doesn't report mildly cold biomes (where it snows above certain elevation), use IsBiomeCold() for those. */
+extern bool IsBiomeVeryCold(EMCSBiome a_Biome);
+
+/** Returns true if the biome is cold
+(has snow and snowfall at higher elevations but not at regular heights).
+Doesn't report Very Cold biomes, use IsBiomeVeryCold() for those. */
+extern bool IsBiomeCold(EMCSBiome a_Biome);
 
 // tolua_end
-- 
cgit v1.2.3


From 7e1d603080146047bade80ee70982dbe569cdf30 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 19:58:16 +0100
Subject: Added new biomegen: Grown

---
 src/BiomeDef.h            |   6 +
 src/Generating/BioGen.cpp |  93 +++++
 src/Generating/IntGen.h   | 954 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1053 insertions(+)
 create mode 100644 src/Generating/IntGen.h

(limited to 'src')

diff --git a/src/BiomeDef.h b/src/BiomeDef.h
index dfab50663..84751cfd7 100644
--- a/src/BiomeDef.h
+++ b/src/BiomeDef.h
@@ -113,6 +113,12 @@ extern AString BiomeToString(int a_Biome);
 /** Returns true if the biome has no downfall - deserts and savannas */
 extern bool IsBiomeNoDownfall(EMCSBiome a_Biome);
 
+/** Returns true if the biome is an ocean biome. */
+inline bool IsBiomeOcean(int a_Biome)
+{
+	return ((a_Biome == biOcean) || (a_Biome == biDeepOcean));
+}
+
 /** Returns true if the biome is very cold
 (has snow on ground everywhere, turns top water to ice, has snowfall instead of rain everywhere).
 Doesn't report mildly cold biomes (where it snows above certain elevation), use IsBiomeCold() for those. */
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 203faff56..c9405040f 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -5,6 +5,7 @@
 
 #include "Globals.h"
 #include "BioGen.h"
+#include "IntGen.h"
 #include "../IniFile.h"
 #include "../LinearUpscale.h"
 
@@ -916,6 +917,94 @@ void cBioGenTwoLevel::InitializeBiomeGen(cIniFile & a_IniFile)
 
 
 
+////////////////////////////////////////////////////////////////////////////////
+// cBioGenGrown:
+
+class cBioGenGrown:
+	public cBiomeGen
+{
+public:
+	cBioGenGrown(int a_Seed)
+	{
+		auto FinalRivers =
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 1,
+			std::make_shared<cIntGenRiver <10>>  (a_Seed + 2,
+			std::make_shared<cIntGenZoom  <12>>  (a_Seed + 3,
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 4,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <7>>   (a_Seed + 6,
+			std::make_shared<cIntGenZoom  <5>>   (a_Seed + 7,
+			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 8,
+			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 9,
+			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 10,
+			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 11,
+			std::make_shared<cIntGenChoice<2, 4>>(a_Seed + 12
+		))))))))))));
+
+		auto FinalBiomes =
+			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1008,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 15,
+			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1000,
+			std::make_shared<cIntGenZoom           <9>> (a_Seed + 16,
+			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1001,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed,
+			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1002,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 1,
+			std::make_shared<cIntGenBeaches        <6>> (
+			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1002,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom           <7>> (a_Seed + 3,
+			std::make_shared<cIntGenAddIslands     <5>> (a_Seed + 2004, 10,
+			std::make_shared<cIntGenZoom           <5>> (a_Seed + 4,
+			std::make_shared<cIntGenAddToOcean     <4>> (a_Seed + 9, 50, biMushroomIsland,
+			std::make_shared<cIntGenZoom           <6>> (a_Seed + 8,
+			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cIntGenBiomes         <7>> (a_Seed + 3000,
+			std::make_shared<cIntGenZoom           <7>> (a_Seed + 5,
+			std::make_shared<cIntGenBiomeGroupEdges<5>> (
+			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1003,
+			std::make_shared<cIntGenZoom           <9>> (a_Seed + 7,
+			std::make_shared<cIntGenReplaceRandomly<6>> (bgJungle, bgTemperate, 50, a_Seed + 100,
+			std::make_shared<cIntGenReplaceRandomly<6>> (bgIce,    bgTemperate, 50, a_Seed + 101,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 70,
+			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2003, 50,
+			std::make_shared<cIntGenZoom           <6>> (a_Seed + 11,
+			std::make_shared<cIntLandOcean         <5>> (a_Seed + 100, 65
+		))))))))))))))))))))))))))))));
+
+		m_Gen =
+			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
+			std::make_shared<cIntGenZoom     <18>>(a_Seed,
+			std::make_shared<cIntGenSmooth   <11>>(a_Seed,
+			std::make_shared<cIntGenZoom     <13>>(a_Seed,
+			std::make_shared<cIntGenMixRivers<8>> (
+			FinalBiomes, FinalRivers
+		)))));
+	}
+
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
+	{
+		cIntGen<16, 16>::Values vals;
+		m_Gen->GetInts(a_ChunkX * cChunkDef::Width, a_ChunkZ * cChunkDef::Width, vals);
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				cChunkDef::SetBiome(a_Biomes, x, z, (EMCSBiome)vals[x + cChunkDef::Width * z]);
+			}
+		}
+	}
+
+protected:
+	cIntGenPtr<16, 16> m_Gen;
+};
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // cBiomeGen:
 
@@ -952,6 +1041,10 @@ cBiomeGenPtr cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool &
 	{
 		res = new cBioGenTwoLevel(a_Seed);
 	}
+	else if (NoCaseCompare(BiomeGenName, "grown") == 0)
+	{
+		res = new cBioGenGrown(a_Seed);
+	}
 	else
 	{
 		if (NoCaseCompare(BiomeGenName, "multistepmap") != 0)
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
new file mode 100644
index 000000000..ae940232f
--- /dev/null
+++ b/src/Generating/IntGen.h
@@ -0,0 +1,954 @@
+
+// IntGen.h
+
+// Declares the cIntGen class and descendants for generating and filtering various 2D arrays of ints
+
+/*
+The integers generated may be interpreted in several ways:
+- land/see designators
+	- 0 = ocean
+	- >0 = land
+- biome group designators
+	- 0 = ocean
+	- 1 = desert biomes
+	- 2 = temperate biomes
+	- 3 = mountains (hills and forests)
+	- 4 = jungle
+	- 5 = ice biomes
+- biome IDs
+The interpretation depends on the generator used and on the position in the chain.
+
+The generators can be chained together - one produces data that another one consumes.
+Some of such chain connections require changing the data dimensions between the two, which is handled automatically
+by using templates.
+*/
+
+
+
+
+
+#pragma once
+
+#include "../BiomeDef.h"
+
+
+
+
+
+/** Constants representing the biome group designators. */
+const int bgOcean     = 0;
+const int bgDesert    = 1;
+const int bgTemperate = 2;
+const int bgMountains = 3;
+const int bgJungle    = 4;
+const int bgIce       = 5;
+const int bgMax       = 5;  // Maximum biome group value
+
+
+
+
+
+/** Interface that all the generator classes provide. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGen
+{
+public:
+	/** Holds the array of values generated by this class (descendant). */
+	typedef int Values[SizeX * SizeZ];
+
+	/** Generates the array of templated size into a_Values, based on given min coords. */
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) = 0;
+};
+
+template <int SizeX, int SizeZ = SizeX>
+using cIntGenPtr = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
+
+
+
+
+
+
+/** Provides additional cNoise member and its helper functions. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenWithNoise :
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+
+public:
+	cIntGenWithNoise(int a_Seed) :
+		m_Noise(a_Seed)
+	{
+	}
+
+protected:
+	cNoise m_Noise;
+
+	/** Chooses one of a_Val1 or a_Val2, based on m_Noise and the coordinates for querying the noise. */
+	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		return ((rnd & 1) == 0) ? a_Val1 : a_Val2;
+	}
+
+	/** Chooses one of a_ValN, based on m_Noise and the coordinates for querying the noise. */
+	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2, int a_Val3, int a_Val4)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		switch (rnd % 4)
+		{
+			case 0:  return a_Val1;
+			case 1:  return a_Val2;
+			case 2:  return a_Val3;
+			default: return a_Val4;
+		}
+	}
+};
+
+
+
+
+
+
+/** Generates a 2D array of random integers in the specified range [0 .. Range). */
+template <int Range, int SizeX, int SizeZ = SizeX>
+class cIntGenChoice :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	cIntGenChoice(int a_Seed) :
+		super(a_Seed)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < SizeX; x++)
+			{
+				a_Values[x + SizeX * z] = (m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % Range;
+			}
+		}  // for z
+	}
+};
+
+
+
+
+
+
+/** Decides between the ocean and landmass biomes.
+Has a threshold (in percent) of how much land, the larger the threshold, the more land.
+Generates 0 for ocean, biome group ID for landmass. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntLandOcean :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	cIntLandOcean(int a_Seed, int a_Threshold) :
+		super(a_Seed),
+		m_Threshold(a_Threshold)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int rnd = (m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
+				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgMax + 1) : 0;
+			}
+		}
+	}
+
+protected:
+	int m_Threshold;
+};
+
+
+
+
+
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenZoom :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+protected:
+	static const int m_LowerSizeX = (SizeX / 2) + 2;
+	static const int m_LowerSizeZ = (SizeZ / 2) + 2;
+
+public:
+	typedef cIntGenPtr<m_LowerSizeX, m_LowerSizeZ> Underlying;
+
+
+	cIntGenZoom(int a_Seed, Underlying a_UnderlyingGen) :
+		super(a_Seed),
+		m_UnderlyingGen(a_UnderlyingGen)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Generate the underlying data with half the resolution:
+		int lowerMinX = a_MinX >> 1;
+		int lowerMinZ = a_MinZ >> 1;
+		int Underlying[m_LowerSizeX * m_LowerSizeZ];
+		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, Underlying);
+		const int lowStepX = (m_LowerSizeX - 1) * 2;
+		const int lowStepZ = (m_LowerSizeZ - 1) * 2;
+		int Cache[lowStepX * lowStepZ];
+
+		// Discreet-interpolate the values into twice the size:
+		for (int z = 0; z < m_LowerSizeZ - 1; ++z)
+		{
+			int idx = (z * 2) * lowStepX;
+			int PrevZ0 = Underlying[z * m_LowerSizeX];
+			int PrevZ1 = Underlying[(z + 1) * m_LowerSizeX];
+
+			for (int x = 0; x < m_LowerSizeX - 1; ++x)
+			{
+				int ValX1Z0 = Underlying[x + 1 + z * m_LowerSizeX];
+				int ValX1Z1 = Underlying[x + 1 + (z + 1) * m_LowerSizeX];
+				int RndX = (x + lowerMinX) * 2;
+				int RndZ = (z + lowerMinZ) * 2;
+				Cache[idx] = PrevZ0;
+				Cache[idx + lowStepX] = ChooseRandomOne(RndX, RndZ, PrevZ0, PrevZ1);
+				idx++;
+				Cache[idx] = ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0);
+				Cache[idx + lowStepX] = ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				idx++;
+				PrevZ0 = ValX1Z0;
+				PrevZ1 = ValX1Z1;
+			}
+		}
+
+		// Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
+		for (int z = 0; z < SizeZ; ++z)
+		{
+			memcpy(a_Values + z * SizeX, Cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), SizeX * sizeof(int));
+		}
+	}
+
+protected:
+	Underlying m_UnderlyingGen;
+};
+
+
+
+
+
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenSmooth :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int m_UnderlyingSizeX = SizeX + 2;
+	static const int m_UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef cIntGenPtr<m_UnderlyingSizeX, m_UnderlyingSizeZ> Underlying;
+
+
+	cIntGenSmooth(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Generate the underlying values:
+		int Cache[(SizeX + 2) * (SizeZ + 2)];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+
+		// Smooth - for each square check if the surroundings are the same, if so, expand them diagonally.
+		// Also get rid of single-pixel irregularities (A-B-A):
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int NoiseZ = a_MinZ + z;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val   = Cache[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int Above = Cache[x + 1 +  z      * m_UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int Left  = Cache[x     + (z + 1) * m_UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
+
+				if ((Left == Right) && (Above == Below))
+				{
+					if (((m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
+					{
+						val = Left;
+					}
+					else
+					{
+						val = Above;
+					}
+				}
+				else
+				{
+					if (Left == Right)
+					{
+						val = Left;
+					}
+
+					if (Above == Below)
+					{
+						val = Above;
+					}
+				}
+
+				a_Values[x + z * SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+template<int SizeX, int SizeZ = SizeX>
+class cIntGenBeaches :
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+	static const int m_UnderlyingSizeX = SizeX + 2;
+	static const int m_UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef cIntGenPtr<m_UnderlyingSizeX, m_UnderlyingSizeZ> Underlying;
+
+
+	cIntGenBeaches(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Map for biome -> its beach:
+		static const int ToBeach[] =
+		{
+			/* biOcean            */ biOcean,
+			/* biPlains           */ biBeach,
+			/* biDesert           */ biBeach,
+			/* biExtremeHills     */ biStoneBeach,
+			/* biForest           */ biBeach,
+			/* biTaiga            */ biColdBeach,
+			/* biSwampland        */ biSwampland,
+			/* biRiver            */ biRiver,
+			/* biNether           */ biNether,
+			/* biEnd              */ biEnd,
+			/* biFrozenOcean      */ biColdBeach,
+			/* biFrozenRiver      */ biColdBeach,
+			/* biIcePlains        */ biColdBeach,
+			/* biIceMountains     */ biColdBeach,
+			/* biMushroomIsland   */ biMushroomShore,
+			/* biMushroomShore    */ biMushroomShore,
+			/* biBeach            */ biBeach,
+			/* biDesertHills      */ biBeach,
+			/* biForestHills      */ biBeach,
+			/* biTaigaHills       */ biColdBeach,
+			/* biExtremeHillsEdge */ biStoneBeach,
+			/* biJungle           */ biBeach,
+			/* biJungleHills      */ biBeach,
+			/* biJungleEdge       */ biBeach,
+			/* biDeepOcean        */ biOcean,
+			/* biStoneBeach       */ biStoneBeach,
+			/* biColdBeach        */ biColdBeach,
+			/* biBirchForest      */ biBeach,
+			/* biBirchForestHills */ biBeach,
+			/* biRoofedForest     */ biBeach,
+			/* biColdTaiga        */ biColdBeach,
+			/* biColdTaigaHills   */ biColdBeach,
+			/* biMegaTaiga        */ biStoneBeach,
+			/* biMegaTaigaHills   */ biStoneBeach,
+			/* biExtremeHillsPlus */ biStoneBeach,
+			/* biSavanna          */ biBeach,
+			/* biSavannaPlateau   */ biBeach,
+			/* biMesa             */ biMesa,
+			/* biMesaPlateauF     */ biMesa,
+			/* biMesaPlateau      */ biMesa,
+		};
+
+		// Generate the underlying values:
+		int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+
+		// Add beaches between ocean and biomes:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val = Cache[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int Above = Cache[x + 1 + z * m_UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int Left  = Cache[x     + (z + 1) * m_UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					if (IsBiomeOcean(Above) || IsBiomeOcean(Below) || IsBiomeOcean(Left) || IsBiomeOcean(Right))
+					{
+						val = ToBeach[(val % 128) % ARRAYCOUNT(ToBeach)];
+					}
+				}
+				a_Values[x + z * SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Generates the underlying numbers and then randomly changes some zeroes into nonzeroes. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenAddIslands :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+
+
+	cIntGenAddIslands(int a_Seed, int a_Threshold, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Threshold(a_Threshold),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				if (a_Values[x + z * SizeX] == 0)
+				{
+					int rnd = m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
+					if (rnd % 100 < m_Threshold)
+					{
+						a_Values[x + z * SizeX] = (rnd / 100) % 4;
+					}
+				}
+			}
+		}
+	}
+
+protected:
+	int m_Threshold;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** A filter that adds an edge biome group between two biome groups that need an edge between them. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBiomeGroupEdges :
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+
+	static const int m_UnderlyingSizeX = SizeX + 2;
+	static const int m_UnderlyingSizeZ = SizeZ + 2;
+
+public:
+
+	typedef cIntGenPtr<m_UnderlyingSizeX, m_UnderlyingSizeZ> Underlying;
+
+	cIntGenBiomeGroupEdges(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values)
+	{
+		// Generate the underlying biome groups:
+		int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX, a_MinZ, Cache);
+
+		// Change the biomes on incompatible edges into an edge biome:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int v = Cache[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int Above = Cache[x + 1 + z * m_UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int Left  = Cache[x     + (z + 1) * m_UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				switch (v)
+				{
+					// Oceans don't need any edges:
+					case bgOcean:
+					{
+						v = bgOcean;
+						break;
+					}
+
+					// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
+					case bgDesert:
+					{
+						if (
+							!IsDesertCompatible(Above) ||
+							!IsDesertCompatible(Below) ||
+							!IsDesertCompatible(Left) ||
+							!IsDesertCompatible(Right)
+						)
+						{
+							v = bgTemperate;
+						}
+						break;
+					}
+
+					// Ice should not neighbor deserts; change to temperate:
+					case bgIce:
+					{
+						if (
+							(Above == bgDesert) ||
+							(Below == bgDesert) ||
+							(Left == bgDesert) ||
+							(Right == bgDesert)
+						)
+						{
+							v = bgTemperate;
+						}
+						break;
+					}
+
+					// Jungle should not neighbor Desert or Ice; change to temperate:
+					case bgJungle:
+					{
+						if (
+							!IsJungleCompatible(Above) ||
+							!IsJungleCompatible(Below) ||
+							!IsJungleCompatible(Left) ||
+							!IsJungleCompatible(Right)
+						)
+						{
+							v = bgTemperate;
+						}
+					}
+				}
+				a_Values[x + z * SizeX] = v;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+
+
+	inline bool IsDesertCompatible(int a_BiomeGroup)
+	{
+		return ((a_BiomeGroup == bgOcean) || (a_BiomeGroup == bgDesert) || (a_BiomeGroup == bgTemperate));
+	}
+
+	inline bool IsJungleCompatible(int a_BiomeGroup)
+	{
+		return ((a_BiomeGroup != bgDesert) && (a_BiomeGroup != bgIce));
+	}
+};
+
+
+
+
+
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBiomes :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+
+
+	cIntGenBiomes(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Define the per-biome-group biomes:
+		static const int OceanBiomes[] =
+		{
+			biOcean, // biDeepOcean,
+		};
+
+		static const int DesertBiomes[] =
+		{
+			biDesert, biDesert, biSavanna, biPlains,
+		};
+
+		static const int TemperateBiomes[] =
+		{
+			biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
+		};
+
+		static const int MountainBiomes[] =
+		{
+			biExtremeHills, biForest, biTaiga, biPlains,
+		};
+
+		static const int JungleBiomes[] =
+		{
+			biJungle, biJungle, biForest,
+		};
+
+		static const int IceBiomes[] =
+		{
+			biIcePlains, biIcePlains, biColdTaiga,
+		};
+
+		static const cBiomesInGroups BiomesInGroups[] =
+		{
+			{ static_cast<int>(ARRAYCOUNT(OceanBiomes)),     OceanBiomes},
+			{ static_cast<int>(ARRAYCOUNT(DesertBiomes)),    DesertBiomes},
+			{ static_cast<int>(ARRAYCOUNT(TemperateBiomes)), TemperateBiomes},
+			{ static_cast<int>(ARRAYCOUNT(MountainBiomes)),  MountainBiomes},
+			{ static_cast<int>(ARRAYCOUNT(JungleBiomes)),    JungleBiomes},
+			{ static_cast<int>(ARRAYCOUNT(IceBiomes)),       IceBiomes},
+		};
+
+		// Generate the underlying values, representing biome groups:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Overwrite each biome group with a random biome from that group:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int IdxZ = z * SizeX;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val = a_Values[x + IdxZ];
+				const cBiomesInGroups & Biomes = BiomesInGroups[val % ARRAYCOUNT(BiomesInGroups)];
+				int rnd = (m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
+				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
+			}
+		}
+	}
+
+protected:
+
+	struct cBiomesInGroups
+	{
+		const int Count;
+		const int * Biomes;
+	};
+
+
+	/** The underlying int generator */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenReplaceRandomly :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+
+
+	cIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_From(a_From),
+		m_To(a_To),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Generate the underlying values:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Replace some of the values:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int idxZ = z * SizeX;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (a_Values[idx] == m_From)
+				{
+					int rnd = m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+					if (rnd % 100 < m_Chance)
+					{
+						a_Values[idx] = m_To;
+					}
+				}
+			}
+		}  // for z
+	}
+
+
+protected:
+	int m_From;
+	int m_To;
+	int m_Chance;
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Mixer that joins together finalized biomes and rivers.
+It first checks for oceans; if there's no ocean, it checks for a river. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenMixRivers:
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+
+public:
+	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+
+
+	cIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers):
+		m_Biomes(a_Biomes),
+		m_Rivers(a_Rivers)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Generate the underlying data:
+		m_Biomes->GetInts(a_MinX, a_MinZ, a_Values);
+		Values Rivers;
+		m_Rivers->GetInts(a_MinX, a_MinZ, Rivers);
+
+		// Mix the values:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int idxZ = z * SizeX;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (IsBiomeOcean(a_Values[idx]))
+				{
+					// Oceans are kept without any changes
+					continue;
+				}
+				if (Rivers[idx] != biRiver)
+				{
+					// There's no river, keep the current value
+					continue;
+				}
+
+				// There's a river, change the output to a river or a frozen river, based on the original biome:
+				if (IsBiomeVeryCold((EMCSBiome)a_Values[idx]))
+				{
+					a_Values[idx] = biFrozenRiver;
+				}
+				else
+				{
+					a_Values[idx] = biRiver;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Biomes;
+	Underlying m_Rivers;
+};
+
+
+
+
+
+/** Generates a river based on the underlying data.
+This is basically an edge detector over the underlying data. The rivers are the edges where the underlying data
+changes from one pixel to its neighbor. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenRiver:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int UnderlyingSizeX = SizeX + 2;
+	static const int UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef cIntGenPtr<UnderlyingSizeX, UnderlyingSizeZ> Underlying;
+
+
+	cIntGenRiver(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Generate the underlying data:
+		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+
+		// Detect the edges:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int Above = Cache[x + 1 + z * UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
+				int Left  = Cache[x +     (z + 1) * UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
+				int val   = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
+
+				if ((val == Above) && (val == Below) && (val == Left) && (val == Right))
+				{
+					val = 0;
+				}
+				else
+				{
+					val = biRiver;
+				}
+				a_Values[x + z * SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Turns some of the oceans into the specified biome. Used for mushroom and deep ocean.
+The biome is only placed if at least 3 of its neighbors are ocean and only with the specified chance. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenAddToOcean:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int UnderlyingSizeX = SizeX + 2;
+	static const int UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef cIntGenPtr<UnderlyingSizeX, UnderlyingSizeZ> Underlying;
+
+
+	cIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	{
+		// Generate the underlying data:
+		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+
+		// Add the mushroom islands:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					a_Values[x + z * SizeX] = val;
+					continue;
+				}
+
+				// Count the ocean neighbors:
+				int Above = Cache[x + 1 + z * UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
+				int Left  = Cache[x +     (z + 1) * UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
+				int NumOceanNeighbors = 0;
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+
+				// If at least 3 ocean neighbors and the chance is right, change:
+				if ((NumOceanNeighbors >= 3) && ((m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance))
+				{
+					a_Values[x + z * SizeX] = m_ToValue;
+				}
+				else
+				{
+					a_Values[x + z * SizeX] = val;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	/** Chance, in permille, of changing the biome. */
+	int m_Chance;
+
+	/** The value to change the ocean into. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
-- 
cgit v1.2.3


From dcad6d362685367d996f7acf7c3783f684d269f6 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 20:12:29 +0100
Subject: Added a missing header to CMakeLists.

---
 src/Generating/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index cd3d5a9f3..afe30533e 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -46,6 +46,7 @@ SET (HDRS
 	FinishGen.h
 	GridStructGen.h
 	HeiGen.h
+	IntGen.h
 	MineShafts.h
 	NetherFortGen.h
 	Noise3DGenerator.h
-- 
cgit v1.2.3


From dcbe1717cc4e86b3d48c93da9654592ef2373073 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 21:35:24 +0100
Subject: Fixed a copypasta error in cIntGenAddToOcean.

---
 src/Generating/IntGen.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index ae940232f..a0064715f 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -124,7 +124,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename Values & a_Values) override
 	{
 		for (int z = 0; z < SizeZ; z++)
 		{
@@ -913,15 +913,15 @@ public:
 				{
 					NumOceanNeighbors += 1;
 				}
-				if (IsBiomeOcean(Above))
+				if (IsBiomeOcean(Below))
 				{
 					NumOceanNeighbors += 1;
 				}
-				if (IsBiomeOcean(Above))
+				if (IsBiomeOcean(Left))
 				{
 					NumOceanNeighbors += 1;
 				}
-				if (IsBiomeOcean(Above))
+				if (IsBiomeOcean(Right))
 				{
 					NumOceanNeighbors += 1;
 				}
-- 
cgit v1.2.3


From 74df4618de1c52c22f892e0bf82ec612521a10c0 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 22:56:02 +0100
Subject: BioGenGrown: Smaller biomes, add land to map center.

---
 src/Generating/BioGen.cpp |  6 ++----
 src/Generating/IntGen.h   | 23 +++++++++++------------
 2 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index c9405040f..fcb4d74ed 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -969,10 +969,8 @@ public:
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 70,
 			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
 			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
-			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2003, 50,
-			std::make_shared<cIntGenZoom           <6>> (a_Seed + 11,
-			std::make_shared<cIntLandOcean         <5>> (a_Seed + 100, 65
-		))))))))))))))))))))))))))))));
+			std::make_shared<cIntGenLandOcean      <6>> (a_Seed + 100, 65
+		))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index a0064715f..1eb20711d 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -124,7 +124,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, typename Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		for (int z = 0; z < SizeZ; z++)
 		{
@@ -146,13 +146,13 @@ public:
 Has a threshold (in percent) of how much land, the larger the threshold, the more land.
 Generates 0 for ocean, biome group ID for landmass. */
 template <int SizeX, int SizeZ = SizeX>
-class cIntLandOcean :
+class cIntGenLandOcean :
 	public cIntGenWithNoise<SizeX, SizeZ>
 {
 	typedef cIntGenWithNoise<SizeX, SizeZ> super;
 
 public:
-	cIntLandOcean(int a_Seed, int a_Threshold) :
+	cIntGenLandOcean(int a_Seed, int a_Threshold) :
 		super(a_Seed),
 		m_Threshold(a_Threshold)
 	{
@@ -170,6 +170,12 @@ public:
 				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgMax + 1) : 0;
 			}
 		}
+
+		// If the centerpoint of the world is within the area, set it to bgTemperate, always:
+		if ((a_MinX <= 0) && (a_MinZ <= 0) && (a_MinX + SizeX > 0) && (a_MinZ + SizeZ > 0))
+		{
+			a_Values[-a_MinX - a_MinZ * SizeX] = bgTemperate;
+		}
 	}
 
 protected:
@@ -451,12 +457,12 @@ public:
 		{
 			for (int x = 0; x < SizeX; x++)
 			{
-				if (a_Values[x + z * SizeX] == 0)
+				if (a_Values[x + z * SizeX] == bgOcean)
 				{
 					int rnd = m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
 					if (rnd % 100 < m_Threshold)
 					{
-						a_Values[x + z * SizeX] = (rnd / 100) % 4;
+						a_Values[x + z * SizeX] = (rnd / 100) % bgMax;
 					}
 				}
 			}
@@ -511,13 +517,6 @@ public:
 				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
 				switch (v)
 				{
-					// Oceans don't need any edges:
-					case bgOcean:
-					{
-						v = bgOcean;
-						break;
-					}
-
 					// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
 					case bgDesert:
 					{
-- 
cgit v1.2.3


From 7d6db6f33d60a7976e714478ec27e65faa79a46b Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 26 Oct 2014 22:59:59 +0100
Subject: IntGen: Attempt at fixing Linux compilation.

---
 src/Generating/IntGen.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 1eb20711d..20927f7fb 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -131,7 +131,7 @@ public:
 			int BaseZ = a_MinZ + z;
 			for (int x = 0; x < SizeX; x++)
 			{
-				a_Values[x + SizeX * z] = (m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % Range;
+				a_Values[x + SizeX * z] = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % Range;
 			}
 		}  // for z
 	}
@@ -159,7 +159,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		for (int z = 0; z < SizeZ; z++)
 		{
@@ -207,7 +207,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying data with half the resolution:
 		int lowerMinX = a_MinX >> 1;
@@ -276,7 +276,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying values:
 		int Cache[(SizeX + 2) * (SizeZ + 2)];
@@ -350,7 +350,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Map for biome -> its beach:
 		static const int ToBeach[] =
@@ -450,7 +450,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
 		for (int z = 0; z < SizeZ; z++)
@@ -499,7 +499,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values)
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values)
 	{
 		// Generate the underlying biome groups:
 		int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ];
@@ -602,7 +602,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Define the per-biome-group biomes:
 		static const int OceanBiomes[] =
@@ -699,7 +699,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying values:
 		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
@@ -754,11 +754,11 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying data:
 		m_Biomes->GetInts(a_MinX, a_MinZ, a_Values);
-		Values Rivers;
+		typename super::Values Rivers;
 		m_Rivers->GetInts(a_MinX, a_MinZ, Rivers);
 
 		// Mix the values:
@@ -823,7 +823,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying data:
 		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
@@ -884,7 +884,7 @@ public:
 	}
 
 
-	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) override
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying data:
 		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
-- 
cgit v1.2.3


From 7d08d34693706ef70cff6cfc796d4f7cbd396bc5 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 27 Oct 2014 09:35:21 +0100
Subject: Removed too advanced C++11 features.

We need to keep gcc 4.6 compatibility; these features were not implemented in that version yet.
---
 src/Generating/BioGen.cpp |  2 +-
 src/Generating/IntGen.h   | 58 ++++++++++++++++++++++-------------------------
 2 files changed, 28 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index fcb4d74ed..96c181915 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -996,7 +996,7 @@ public:
 	}
 
 protected:
-	cIntGenPtr<16, 16> m_Gen;
+	std::shared_ptr<cIntGen<16, 16>> m_Gen;
 };
 
 
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 20927f7fb..94a17abd9 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -60,10 +60,6 @@ public:
 	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) = 0;
 };
 
-template <int SizeX, int SizeZ = SizeX>
-using cIntGenPtr = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
-
-
 
 
 
@@ -166,7 +162,7 @@ public:
 			int BaseZ = a_MinZ + z;
 			for (int x = 0; x < SizeX; x++)
 			{
-				int rnd = (m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
+				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
 				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgMax + 1) : 0;
 			}
 		}
@@ -197,7 +193,7 @@ protected:
 	static const int m_LowerSizeZ = (SizeZ / 2) + 2;
 
 public:
-	typedef cIntGenPtr<m_LowerSizeX, m_LowerSizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>> Underlying;
 
 
 	cIntGenZoom(int a_Seed, Underlying a_UnderlyingGen) :
@@ -232,10 +228,10 @@ public:
 				int RndX = (x + lowerMinX) * 2;
 				int RndZ = (z + lowerMinZ) * 2;
 				Cache[idx] = PrevZ0;
-				Cache[idx + lowStepX] = ChooseRandomOne(RndX, RndZ, PrevZ0, PrevZ1);
+				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, PrevZ1);
 				idx++;
-				Cache[idx] = ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0);
-				Cache[idx + lowStepX] = ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				Cache[idx] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0);
+				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
 				idx++;
 				PrevZ0 = ValX1Z0;
 				PrevZ1 = ValX1Z1;
@@ -262,11 +258,11 @@ class cIntGenSmooth :
 	public cIntGenWithNoise<SizeX, SizeZ>
 {
 	typedef cIntGenWithNoise<SizeX, SizeZ> super;
-	static const int m_UnderlyingSizeX = SizeX + 2;
-	static const int m_UnderlyingSizeZ = SizeZ + 2;
+	static const int UnderlyingSizeX = SizeX + 2;
+	static const int UnderlyingSizeZ = SizeZ + 2;
 
 public:
-	typedef cIntGenPtr<m_UnderlyingSizeX, m_UnderlyingSizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>> Underlying;
 
 
 	cIntGenSmooth(int a_Seed, Underlying a_Underlying) :
@@ -279,7 +275,7 @@ public:
 	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying values:
-		int Cache[(SizeX + 2) * (SizeZ + 2)];
+		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
 		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
 
 		// Smooth - for each square check if the surroundings are the same, if so, expand them diagonally.
@@ -289,15 +285,15 @@ public:
 			int NoiseZ = a_MinZ + z;
 			for (int x = 0; x < SizeX; x++)
 			{
-				int val   = Cache[x + 1 + (z + 1) * m_UnderlyingSizeX];
-				int Above = Cache[x + 1 +  z      * m_UnderlyingSizeX];
-				int Below = Cache[x + 1 + (z + 2) * m_UnderlyingSizeX];
-				int Left  = Cache[x     + (z + 1) * m_UnderlyingSizeX];
-				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				int val   = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
+				int Above = Cache[x + 1 +  z      * UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
+				int Left  = Cache[x     + (z + 1) * UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
 
 				if ((Left == Right) && (Above == Below))
 				{
-					if (((m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
+					if (((super::m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
 					{
 						val = Left;
 					}
@@ -341,7 +337,7 @@ class cIntGenBeaches :
 	static const int m_UnderlyingSizeZ = SizeZ + 2;
 
 public:
-	typedef cIntGenPtr<m_UnderlyingSizeX, m_UnderlyingSizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<m_UnderlyingSizeX, m_UnderlyingSizeZ>> Underlying;
 
 
 	cIntGenBeaches(Underlying a_Underlying) :
@@ -439,7 +435,7 @@ class cIntGenAddIslands :
 	typedef cIntGenWithNoise<SizeX, SizeZ> super;
 
 public:
-	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
 
 
 	cIntGenAddIslands(int a_Seed, int a_Threshold, Underlying a_Underlying) :
@@ -459,7 +455,7 @@ public:
 			{
 				if (a_Values[x + z * SizeX] == bgOcean)
 				{
-					int rnd = m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
+					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
 					if (rnd % 100 < m_Threshold)
 					{
 						a_Values[x + z * SizeX] = (rnd / 100) % bgMax;
@@ -491,7 +487,7 @@ class cIntGenBiomeGroupEdges :
 
 public:
 
-	typedef cIntGenPtr<m_UnderlyingSizeX, m_UnderlyingSizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<m_UnderlyingSizeX, m_UnderlyingSizeZ>> Underlying;
 
 	cIntGenBiomeGroupEdges(Underlying a_Underlying) :
 		m_Underlying(a_Underlying)
@@ -592,7 +588,7 @@ class cIntGenBiomes :
 	typedef cIntGenWithNoise<SizeX, SizeZ> super;
 
 public:
-	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
 
 
 	cIntGenBiomes(int a_Seed, Underlying a_Underlying) :
@@ -656,7 +652,7 @@ public:
 			{
 				int val = a_Values[x + IdxZ];
 				const cBiomesInGroups & Biomes = BiomesInGroups[val % ARRAYCOUNT(BiomesInGroups)];
-				int rnd = (m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
+				int rnd = (super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
 				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
 			}
 		}
@@ -686,7 +682,7 @@ class cIntGenReplaceRandomly :
 	typedef cIntGenWithNoise<SizeX, SizeZ> super;
 
 public:
-	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
 
 
 	cIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying) :
@@ -713,7 +709,7 @@ public:
 				int idx = x + idxZ;
 				if (a_Values[idx] == m_From)
 				{
-					int rnd = m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+					int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
 					if (rnd % 100 < m_Chance)
 					{
 						a_Values[idx] = m_To;
@@ -744,7 +740,7 @@ class cIntGenMixRivers:
 	typedef cIntGen<SizeX, SizeZ> super;
 
 public:
-	typedef cIntGenPtr<SizeX, SizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
 
 
 	cIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers):
@@ -813,7 +809,7 @@ class cIntGenRiver:
 	static const int UnderlyingSizeZ = SizeZ + 2;
 
 public:
-	typedef cIntGenPtr<UnderlyingSizeX, UnderlyingSizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>> Underlying;
 
 
 	cIntGenRiver(int a_Seed, Underlying a_Underlying):
@@ -872,7 +868,7 @@ class cIntGenAddToOcean:
 	static const int UnderlyingSizeZ = SizeZ + 2;
 
 public:
-	typedef cIntGenPtr<UnderlyingSizeX, UnderlyingSizeZ> Underlying;
+	typedef std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>> Underlying;
 
 
 	cIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
@@ -926,7 +922,7 @@ public:
 				}
 
 				// If at least 3 ocean neighbors and the chance is right, change:
-				if ((NumOceanNeighbors >= 3) && ((m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance))
+				if ((NumOceanNeighbors >= 3) && ((super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance))
 				{
 					a_Values[x + z * SizeX] = m_ToValue;
 				}
-- 
cgit v1.2.3


From a068ebf3e022f72ae703b762215abb5039cd35c8 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 27 Oct 2014 09:48:57 +0100
Subject: cIntGen: Added a virtual destructor.

---
 src/Generating/IntGen.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 94a17abd9..d7ed9275a 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -53,6 +53,10 @@ template <int SizeX, int SizeZ = SizeX>
 class cIntGen
 {
 public:
+	/** Force a virtual destructor in all descendants.
+	Descendants contain virtual functions and are referred to via pointer-to-base, so they need a virtual destructor. */
+	virtual ~cIntGen() {}
+
 	/** Holds the array of values generated by this class (descendant). */
 	typedef int Values[SizeX * SizeZ];
 
-- 
cgit v1.2.3


From 11a80b5d09241ade0a740d1db0d0d2084ab81e3a Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 16:46:17 +0000
Subject: Pocess?

---
 src/BlockID.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/BlockID.h b/src/BlockID.h
index b0cdc2a00..98eef2684 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -1,7 +1,7 @@
 #pragma once
 
-// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua pocess the values.
-// ToLua doesn't understand typed enums, so we use preprocessor to hide it from ToLua
+// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua peocess the values.
+// ToLua doesn't understand typed enums, so we use preprocessor to hide it from ToLua.
 
 enum ENUM_BLOCK_ID : BLOCKTYPE
 #if 0
-- 
cgit v1.2.3


From cbb637187e4ca3435bddc0c07285ba4933445fba Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 16:46:30 +0000
Subject: Fixed typo.

---
 src/BlockID.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/BlockID.h b/src/BlockID.h
index 98eef2684..24de2dc8a 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -1,6 +1,6 @@
 #pragma once
 
-// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua peocess the values.
+// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua process the values.
 // ToLua doesn't understand typed enums, so we use preprocessor to hide it from ToLua.
 
 enum ENUM_BLOCK_ID : BLOCKTYPE
-- 
cgit v1.2.3


From 8a443c028f6c24659b0a65ff709c8b5f01fd6f5a Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 17:11:31 +0000
Subject: Test warning fix.

---
 src/Generating/DistortedHeightmap.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index aac1d2bf3..d6474b3ca 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -270,6 +270,17 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biMesaBryce            */ { 0.5f,  0.5f},  // 165
 	/* biMesaPlateauFM        */ { 2.0f,  2.0f},  // 166
 	/* biMesaPlateauM         */ { 2.0f,  2.0f},  // 167
+	
+	// biomes 168 .. 255 are unused, 88 empty placeholders here:
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 168 .. 177
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 178 .. 187
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 188 .. 197
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 198 .. 207
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 208 .. 217
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 218 .. 227
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 228 .. 237
+	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 238 .. 247
+	{}, {}, {}, {}, {}, {}, {}, {},          // 248 .. 255
 } ;
 
 
-- 
cgit v1.2.3


From c0a9a83abfb7c161b3d5ed994d6b5bb7bb7a1fb8 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 18:09:34 +0000
Subject: Actually fixed the warning.

---
 src/Generating/DistortedHeightmap.cpp | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index d6474b3ca..5ece4dce5 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -227,15 +227,15 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biMesaPlateau      */ { 2.0f,  2.0f},  // 39
 	
 	// biomes 40 .. 128 are unused, 89 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 40 .. 49
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 50 .. 59
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 60 .. 69
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 70 .. 79
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 80 .. 89
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 90 .. 99
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 100 .. 109
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 110 .. 119
-	{}, {}, {}, {}, {}, {}, {}, {}, {},      // 120 .. 128
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 40 .. 49
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 50 .. 59
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 60 .. 69
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 70 .. 79
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 80 .. 89
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 90 .. 99
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 100 .. 109
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 110 .. 119
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},               // 120 .. 128
 	
 	// Release 1.7 /* biome variants:
 	/* biSunflowerPlains      */ { 1.0f,  1.0f},  // 129
@@ -270,17 +270,6 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biMesaBryce            */ { 0.5f,  0.5f},  // 165
 	/* biMesaPlateauFM        */ { 2.0f,  2.0f},  // 166
 	/* biMesaPlateauM         */ { 2.0f,  2.0f},  // 167
-	
-	// biomes 168 .. 255 are unused, 88 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 168 .. 177
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 178 .. 187
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 188 .. 197
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 198 .. 207
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 208 .. 217
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 218 .. 227
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 228 .. 237
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 238 .. 247
-	{}, {}, {}, {}, {}, {}, {}, {},          // 248 .. 255
 } ;
 
 
-- 
cgit v1.2.3


From 6e21897bc6404f8e95ab61ea4203e5b2d73b19a3 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 19:49:52 +0000
Subject: Fixed remaining warnings.

---
 src/Generating/DistortedHeightmap.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index 5ece4dce5..974aabccd 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -246,22 +246,22 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biSwamplandM           */ { 0.0f,  0.0f},  // 134
 	
 	// Biomes 135 .. 139 unused, 5 empty placeholders here:
-	{}, {}, {}, {}, {},                           // 135 .. 139
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, // 135 .. 139
 
 	/* biIcePlainsSpikes      */ { 1.0f,  1.0f},  // 140
 	
 	// Biomes 141 .. 148 unused, 8 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {},               // 141 .. 148
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, // 141 .. 148
 
 	/* biJungleM              */ { 4.0f,  4.0f},  // 149
-	{},                                           // 150
+	{0.0f,0.0f},                                  // 150
 	/* biJungleEdgeM          */ { 3.0f,  3.0f},  // 151
-	{}, {}, {},                                   // 152 .. 154
+	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},        // 152 .. 154
 	/* biBirchForestM         */ { 3.0f,  3.0f},  // 155
 	/* biBirchForestHillsM    */ { 5.0f,  5.0f},  // 156
 	/* biRoofedForestM        */ { 2.0f,  2.0f},  // 157
 	/* biColdTaigaM           */ { 1.0f,  1.0f},  // 158
-	{},                                           // 159
+	{0.0f,0.0f},                                  // 159
 	/* biMegaSpruceTaiga      */ { 3.0f,  3.0f},  // 160
 	/* biMegaSpruceTaigaHills */ { 3.0f,  3.0f},  // 161
 	/* biExtremeHillsPlusM    */ {32.0f, 32.0f},  // 162
-- 
cgit v1.2.3


From 0cdf262053129cf75c9158f269efa52b29d5b7df Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 19:52:04 +0000
Subject: Fix missing biomes in enum.

---
 src/Generating/FinishGen.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 0564789dc..6b0bd686c 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -414,6 +414,11 @@ void cFinishGenSnow::GenFinish(cChunkDesc & a_ChunkDesc)
 					}
 					break;
 				}
+				default:
+				{
+					// There's no snow in the other biomes.
+					break;
+				}
 			}
 		}
 	}  // for z
-- 
cgit v1.2.3


From 59ca542c28edefc9454dd2be06ca66f5c7a0c18f Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 19:53:16 +0000
Subject: Another switch.

---
 src/Generating/FinishGen.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 6b0bd686c..18f8ee2bc 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -459,6 +459,11 @@ void cFinishGenIce::GenFinish(cChunkDesc & a_ChunkDesc)
 					}
 					break;
 				}
+				default:
+				{
+					// No icy water in other biomes.
+					break;
+				}
 			}
 		}
 	}  // for z
-- 
cgit v1.2.3


From 7de8757ac98cff40a5da575d58e40425f2130057 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 20:05:34 +0000
Subject: Fixed more warnings.

It's ugly though.
---
 src/Generating/HeiGen.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index a0b8770f5..0f883f156 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -430,15 +430,15 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	/* biMesaPlateau         */ { 0.1f,   1.0f,  0.05f,     1.5f,  0.01f,    4.0f,  80},
 	
 	// biomes 40 .. 128 are unused, 89 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 40 .. 49
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 50 .. 59
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 60 .. 69
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 70 .. 79
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 80 .. 89
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 90 .. 99
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 100 .. 109
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 110 .. 119
-	{}, {}, {}, {}, {}, {}, {}, {}, {},      // 120 .. 128
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 40 .. 49
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 50 .. 59
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 60 .. 69
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 70 .. 79
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 80 .. 89
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 90 .. 99
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 100 .. 109
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 110 .. 119
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                     // 120 .. 128
 	
 	/* biSunflowerPlains      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 129
 	/* biDesertM              */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 130
@@ -448,22 +448,22 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	/* biSwamplandM           */ { 1.0f,   3.0f,  1.10f,     7.0f,  0.01f,   0.01f,  60},  // 134
 	
 	// Biomes 135 .. 139 unused, 5 empty placeholders here:
-	{}, {}, {}, {}, {},                                                                    // 135 .. 139
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                    // 135 .. 139
 	
 	/* biIcePlainsSpikes      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 140
 	
 	// Biomes 141 .. 148 unused, 8 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {},                                                        // 141 .. 148
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                        // 141 .. 148
 	
 	/* biJungleM              */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 149
-	{},                                                                                    // 150
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                                    // 150
 	/* biJungleEdgeM          */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 151
-	{}, {}, {},                                                                            // 152 .. 154
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                            // 152 .. 154
 	/* biBirchForestM         */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 155
 	/* biBirchForestHillsM    */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 156
 	/* biRoofedForestM        */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 157
 	/* biColdTaigaM           */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 158
-	{},                                                                                    // 159
+	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                                    // 159
 	/* biMegaSpruceTaiga      */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 160
 	/* biMegaSpruceTaigaHills */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 161
 	/* biExtremeHillsPlusM    */ { 0.2f,   4.0f,  0.05f,    20.0f,  0.01f,   16.0f, 120},  // 162
-- 
cgit v1.2.3


From b67eb2169eba24b767163d882dbf667a429bfbd6 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 20:16:51 +0000
Subject: Another one.#

---
 src/WorldStorage/NBTChunkSerializer.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src')

diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index d85a5c329..1ecdcb5fd 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -604,6 +604,28 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 				m_Writer.AddByte("IsConverting", (((const cZombie *)a_Monster)->IsConverting() ? 1 : 0));
 				break;
 			}
+			case mtInvalidType:
+			case mtBlaze:
+			case mtCaveSpider:
+			case mtChicken:
+			case mtCow:
+			case mtEnderDragon:
+			case mtGhast:
+			case mtGiant:
+			case mtIronGolem
+			case mtMooshroom:
+			case mtOcelot:
+			case mtPig:
+			case mtSilverfish:
+			case mtSnowGolem:
+			case meSpider:
+			case mtSquid:
+			case mtWitch:
+			case mtZombiePigman:
+			{
+				// Other mobs have no special tags.
+				break;
+			}
 		}
 	m_Writer.EndCompound();
 }
-- 
cgit v1.2.3


From a4932bbd8b08ed2f5d6de94fcfcc4d10484c45a2 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Mon, 27 Oct 2014 21:34:02 +0000
Subject: CheckBasicStyle'd

---
 src/Generating/DistortedHeightmap.cpp | 28 ++++++++++++++--------------
 src/Generating/HeiGen.cpp             | 28 ++++++++++++++--------------
 src/IniFile.cpp                       |  6 +++---
 src/IniFile.h                         |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index 974aabccd..7c1ab9997 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -227,15 +227,15 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biMesaPlateau      */ { 2.0f,  2.0f},  // 39
 	
 	// biomes 40 .. 128 are unused, 89 empty placeholders here:
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 40 .. 49
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 50 .. 59
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 60 .. 69
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 70 .. 79
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 80 .. 89
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 90 .. 99
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 100 .. 109
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},  // 110 .. 119
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},               // 120 .. 128
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 40 .. 49
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 50 .. 59
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 60 .. 69
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 70 .. 79
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 80 .. 89
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 90 .. 99
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 100 .. 109
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 110 .. 119
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},               // 120 .. 128
 	
 	// Release 1.7 /* biome variants:
 	/* biSunflowerPlains      */ { 1.0f,  1.0f},  // 129
@@ -246,22 +246,22 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biSwamplandM           */ { 0.0f,  0.0f},  // 134
 	
 	// Biomes 135 .. 139 unused, 5 empty placeholders here:
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, // 135 .. 139
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 135 .. 139
 
 	/* biIcePlainsSpikes      */ { 1.0f,  1.0f},  // 140
 	
 	// Biomes 141 .. 148 unused, 8 empty placeholders here:
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f}, // 141 .. 148
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 141 .. 148
 
 	/* biJungleM              */ { 4.0f,  4.0f},  // 149
-	{0.0f,0.0f},                                  // 150
+	{0.0f, 0.0f},                                  // 150
 	/* biJungleEdgeM          */ { 3.0f,  3.0f},  // 151
-	{0.0f,0.0f}, {0.0f,0.0f}, {0.0f,0.0f},        // 152 .. 154
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},        // 152 .. 154
 	/* biBirchForestM         */ { 3.0f,  3.0f},  // 155
 	/* biBirchForestHillsM    */ { 5.0f,  5.0f},  // 156
 	/* biRoofedForestM        */ { 2.0f,  2.0f},  // 157
 	/* biColdTaigaM           */ { 1.0f,  1.0f},  // 158
-	{0.0f,0.0f},                                  // 159
+	{0.0f, 0.0f},                                  // 159
 	/* biMegaSpruceTaiga      */ { 3.0f,  3.0f},  // 160
 	/* biMegaSpruceTaigaHills */ { 3.0f,  3.0f},  // 161
 	/* biExtremeHillsPlusM    */ {32.0f, 32.0f},  // 162
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 0f883f156..04154dfec 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -430,15 +430,15 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	/* biMesaPlateau         */ { 0.1f,   1.0f,  0.05f,     1.5f,  0.01f,    4.0f,  80},
 	
 	// biomes 40 .. 128 are unused, 89 empty placeholders here:
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 40 .. 49
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 50 .. 59
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 60 .. 69
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 70 .. 79
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 80 .. 89
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 90 .. 99
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 100 .. 109
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},  // 110 .. 119
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                     // 120 .. 128
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 40 .. 49
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 50 .. 59
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 60 .. 69
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 70 .. 79
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 80 .. 89
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 90 .. 99
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 100 .. 109
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 110 .. 119
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                     // 120 .. 128
 	
 	/* biSunflowerPlains      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 129
 	/* biDesertM              */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 130
@@ -448,22 +448,22 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	/* biSwamplandM           */ { 1.0f,   3.0f,  1.10f,     7.0f,  0.01f,   0.01f,  60},  // 134
 	
 	// Biomes 135 .. 139 unused, 5 empty placeholders here:
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                    // 135 .. 139
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 135 .. 139
 	
 	/* biIcePlainsSpikes      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 140
 	
 	// Biomes 141 .. 148 unused, 8 empty placeholders here:
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                        // 141 .. 148
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 141 .. 148
 	
 	/* biJungleM              */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 149
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                                    // 150
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                                                                    // 150
 	/* biJungleEdgeM          */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 151
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0}, {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                            // 152 .. 154
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                                                            // 152 .. 154
 	/* biBirchForestM         */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 155
 	/* biBirchForestHillsM    */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 156
 	/* biRoofedForestM        */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 157
 	/* biColdTaigaM           */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 158
-	{0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0},                                                                                    // 159
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                                                                    // 159
 	/* biMegaSpruceTaiga      */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 160
 	/* biMegaSpruceTaigaHills */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 161
 	/* biExtremeHillsPlusM    */ { 0.2f,   4.0f,  0.05f,    20.0f,  0.01f,   16.0f, 120},  // 162
diff --git a/src/IniFile.cpp b/src/IniFile.cpp
index a666a4ff8..ded7e4199 100644
--- a/src/IniFile.cpp
+++ b/src/IniFile.cpp
@@ -9,7 +9,7 @@
 // Email:        Shane.Hill@dsto.defence.gov.au
 // Reason:       Remove dependancy on MFC. Code should compile on any
 //               platform.
-//////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 /*
 !! MODIFIED BY FAKETRUTH and xoft !!
@@ -79,7 +79,7 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
 		}
 	}
 
-	bool IsFirstLine = true;  
+	bool IsFirstLine = true;
 
 	while (getline(f, line))
 	{
@@ -866,7 +866,7 @@ AString cIniFile::CheckCase(const AString & s) const
 
 void cIniFile::RemoveBom(AString & a_line) const
 {
-	// The BOM sequence for UTF-8 is 0xEF,0xBB,0xBF
+	// The BOM sequence for UTF-8 is 0xEF, 0xBB, 0xBF
 	static unsigned const char BOM[] = { 0xEF, 0xBB, 0xBF };
 
 	// The BOM sequence, if present, is always th e first three characters of the input.
diff --git a/src/IniFile.h b/src/IniFile.h
index 3f704551f..e5879f46c 100644
--- a/src/IniFile.h
+++ b/src/IniFile.h
@@ -9,7 +9,7 @@
 // Email:        Shane.Hill@dsto.defence.gov.au
 // Reason:       Remove dependancy on MFC. Code should compile on any
 //               platform. Tested on Windows/Linux/Irix
-//////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 /*
 !! MODIFIED BY FAKETRUTH and madmaxoft!!
-- 
cgit v1.2.3


From dbe7c8b1702d4141ae0f9d11b74b3d763b8a08c7 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Mon, 27 Oct 2014 21:38:00 +0000
Subject: Comment alignment.

---
 src/Generating/DistortedHeightmap.cpp | 8 ++++----
 src/Generating/HeiGen.cpp             | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index 7c1ab9997..d5bc6ab55 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -235,7 +235,7 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 90 .. 99
 	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 100 .. 109
 	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 110 .. 119
-	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},               // 120 .. 128
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},                // 120 .. 128
 	
 	// Release 1.7 /* biome variants:
 	/* biSunflowerPlains      */ { 1.0f,  1.0f},  // 129
@@ -254,14 +254,14 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 141 .. 148
 
 	/* biJungleM              */ { 4.0f,  4.0f},  // 149
-	{0.0f, 0.0f},                                  // 150
+	{0.0f, 0.0f},                                 // 150
 	/* biJungleEdgeM          */ { 3.0f,  3.0f},  // 151
-	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},        // 152 .. 154
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},     // 152 .. 154
 	/* biBirchForestM         */ { 3.0f,  3.0f},  // 155
 	/* biBirchForestHillsM    */ { 5.0f,  5.0f},  // 156
 	/* biRoofedForestM        */ { 2.0f,  2.0f},  // 157
 	/* biColdTaigaM           */ { 1.0f,  1.0f},  // 158
-	{0.0f, 0.0f},                                  // 159
+	{0.0f, 0.0f},                                 // 159
 	/* biMegaSpruceTaiga      */ { 3.0f,  3.0f},  // 160
 	/* biMegaSpruceTaigaHills */ { 3.0f,  3.0f},  // 161
 	/* biExtremeHillsPlusM    */ {32.0f, 32.0f},  // 162
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 04154dfec..f4e231470 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -438,7 +438,7 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 90 .. 99
 	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 100 .. 109
 	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 110 .. 119
-	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                     // 120 .. 128
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                           // 120 .. 128
 	
 	/* biSunflowerPlains      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 129
 	/* biDesertM              */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 130
@@ -456,14 +456,14 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 141 .. 148
 	
 	/* biJungleM              */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 149
-	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                                                                    // 150
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                               // 150
 	/* biJungleEdgeM          */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 151
-	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                                                            // 152 .. 154
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 152 .. 154
 	/* biBirchForestM         */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 155
 	/* biBirchForestHillsM    */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 156
 	/* biRoofedForestM        */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 157
 	/* biColdTaigaM           */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 158
-	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                                                                    // 159
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                               // 159
 	/* biMegaSpruceTaiga      */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 160
 	/* biMegaSpruceTaigaHills */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 161
 	/* biExtremeHillsPlusM    */ { 0.2f,   4.0f,  0.05f,    20.0f,  0.01f,   16.0f, 120},  // 162
-- 
cgit v1.2.3


From 232343065f508c3ec32a612d15c6cab7a1553721 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Mon, 27 Oct 2014 22:03:11 +0000
Subject: Fixed compile (typos).

---
 src/WorldStorage/NBTChunkSerializer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index 1ecdcb5fd..4daa8cc7b 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -612,13 +612,13 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 			case mtEnderDragon:
 			case mtGhast:
 			case mtGiant:
-			case mtIronGolem
+			case mtIronGolem:
 			case mtMooshroom:
 			case mtOcelot:
 			case mtPig:
 			case mtSilverfish:
 			case mtSnowGolem:
-			case meSpider:
+			case mtSpider:
 			case mtSquid:
 			case mtWitch:
 			case mtZombiePigman:
-- 
cgit v1.2.3


From 373b139ed63bd8ed28962d0836ee6b6ababb3045 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 28 Oct 2014 21:32:01 +0100
Subject: Forgotten m_SendChunksMediumPriority.empty() check.

---
 src/ChunkSender.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/ChunkSender.cpp b/src/ChunkSender.cpp
index ef2be167b..83d82884e 100644
--- a/src/ChunkSender.cpp
+++ b/src/ChunkSender.cpp
@@ -184,7 +184,7 @@ void cChunkSender::Execute(void)
 	while (!m_ShouldTerminate)
 	{
 		cCSLock Lock(m_CS);
-		while (m_ChunksReady.empty() && m_SendChunksLowPriority.empty() && m_SendChunksHighPriority.empty())
+		while (m_ChunksReady.empty() && m_SendChunksLowPriority.empty() && m_SendChunksMediumPriority.empty() && m_SendChunksHighPriority.empty())
 		{
 			int RemoveCount = m_RemoveCount;
 			m_RemoveCount = 0;
-- 
cgit v1.2.3


From f34b1291beb81b4fcf82e155e66f4a43d7caf915 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 29 Oct 2014 15:28:27 +0100
Subject: Grown biomes: made biomes smaller, made beaches smaller.

---
 src/Generating/BioGen.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 96c181915..6fab1b9d9 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -946,18 +946,15 @@ public:
 			std::make_shared<cIntGenZoom           <10>>(a_Seed + 15,
 			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1000,
 			std::make_shared<cIntGenZoom           <9>> (a_Seed + 16,
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1001,
-			std::make_shared<cIntGenZoom           <8>> (a_Seed,
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1002,
-			std::make_shared<cIntGenZoom           <8>> (a_Seed + 1,
 			std::make_shared<cIntGenBeaches        <6>> (
 			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1002,
-			std::make_shared<cIntGenZoom           <10>>(a_Seed + 2,
-			std::make_shared<cIntGenZoom           <7>> (a_Seed + 3,
-			std::make_shared<cIntGenAddIslands     <5>> (a_Seed + 2004, 10,
-			std::make_shared<cIntGenZoom           <5>> (a_Seed + 4,
-			std::make_shared<cIntGenAddToOcean     <4>> (a_Seed + 9, 50, biMushroomIsland,
-			std::make_shared<cIntGenZoom           <6>> (a_Seed + 8,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 1,
+			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1002,
+			std::make_shared<cIntGenZoom           <9>> (a_Seed + 2,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2004, 10,
+			std::make_shared<cIntGenZoom           <6>> (a_Seed + 4,
+			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 9, 50, biMushroomIsland,
+			std::make_shared<cIntGenZoom           <7>> (a_Seed + 8,
 			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 10, 500, biDeepOcean,
 			std::make_shared<cIntGenBiomes         <7>> (a_Seed + 3000,
 			std::make_shared<cIntGenZoom           <7>> (a_Seed + 5,
@@ -970,7 +967,7 @@ public:
 			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
 			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
 			std::make_shared<cIntGenLandOcean      <6>> (a_Seed + 100, 65
-		))))))))))))))))))))))))))));
+		)))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
-- 
cgit v1.2.3


From 165533c27e380300f5e9411e4d46aa553bf2fdeb Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 29 Oct 2014 15:47:43 +0100
Subject: Fixed 1.8 world item format reading.

---
 src/BlockID.cpp               |  7 ++++++-
 src/WorldStorage/WSSAnvil.cpp | 21 +++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index c0f3193bb..c98e0cad1 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -217,7 +217,12 @@ BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString)
 
 bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
 {
-	return gsBlockIDMap.ResolveItem(TrimString(a_ItemTypeString), a_Item);
+	AString ItemName = TrimString(a_ItemTypeString);
+	if (ItemName.substr(0, 10) == "minecraft:")
+	{
+		ItemName = ItemName.substr(10);
+	}
+	return gsBlockIDMap.ResolveItem(ItemName, a_Item);
 }
 
 
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index af7551ee4..0c77b4d67 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -696,11 +696,28 @@ cBlockEntity * cWSSAnvil::LoadBlockEntityFromNBT(const cParsedNBT & a_NBT, int a
 bool cWSSAnvil::LoadItemFromNBT(cItem & a_Item, const cParsedNBT & a_NBT, int a_TagIdx)
 {
 	int Type = a_NBT.FindChildByName(a_TagIdx, "id");
-	if ((Type < 0) || (a_NBT.GetType(Type) != TAG_Short))
+	if (Type <= 0)
 	{
 		return false;
 	}
-	a_Item.m_ItemType = a_NBT.GetShort(Type);
+
+	if (a_NBT.GetType(Type) == TAG_String)
+	{
+		if (!StringToItem(a_NBT.GetString(Type), a_Item))
+		{
+			// Can't resolve item type
+			return false;
+		}
+	}
+	else if (a_NBT.GetType(Type) == TAG_Short)
+	{
+		a_Item.m_ItemType = a_NBT.GetShort(Type);
+	}
+	else
+	{
+		return false;
+	}
+
 	if (a_Item.m_ItemType < 0)
 	{
 		a_Item.Empty();
-- 
cgit v1.2.3


From 8c04abf9aa749af3b15bc92f517b636c9593109e Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 30 Oct 2014 16:24:35 +0100
Subject: QtBiomeVisualiser: Added a prototyping int generator flavor.

This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
---
 src/Generating/BioGen.cpp     |  124 ++++-
 src/Generating/CMakeLists.txt |    1 +
 src/Generating/IntGen.h       |  173 +++++--
 src/Generating/ProtIntGen.h   | 1008 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1253 insertions(+), 53 deletions(-)
 create mode 100644 src/Generating/ProtIntGen.h

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 6fab1b9d9..f9a0a571b 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -6,6 +6,7 @@
 #include "Globals.h"
 #include "BioGen.h"
 #include "IntGen.h"
+#include "ProtIntGen.h"
 #include "../IniFile.h"
 #include "../LinearUpscale.h"
 
@@ -927,9 +928,9 @@ public:
 	cBioGenGrown(int a_Seed)
 	{
 		auto FinalRivers =
-			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 1,
-			std::make_shared<cIntGenRiver <10>>  (a_Seed + 2,
-			std::make_shared<cIntGenZoom  <12>>  (a_Seed + 3,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 1,
+			std::make_shared<cIntGenZoom  <8>>  (a_Seed + 3,
+			std::make_shared<cIntGenRiver <6>>   (a_Seed + 2,
 			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 4,
 			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 5,
 			std::make_shared<cIntGenZoom  <7>>   (a_Seed + 6,
@@ -942,10 +943,10 @@ public:
 		))))))))))));
 
 		auto FinalBiomes =
-			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1008,
-			std::make_shared<cIntGenZoom           <10>>(a_Seed + 15,
-			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1000,
-			std::make_shared<cIntGenZoom           <9>> (a_Seed + 16,
+			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1008,
+			std::make_shared<cIntGenZoom           <8>>(a_Seed + 15,
+			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1000,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 16,
 			std::make_shared<cIntGenBeaches        <6>> (
 			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1002,
 			std::make_shared<cIntGenZoom           <10>>(a_Seed + 1,
@@ -953,7 +954,8 @@ public:
 			std::make_shared<cIntGenZoom           <9>> (a_Seed + 2,
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2004, 10,
 			std::make_shared<cIntGenZoom           <6>> (a_Seed + 4,
-			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 9, 50, biMushroomIsland,
+			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 9, 10, biMushroomIsland,
+			std::make_shared<cIntGenReplaceRandomly<7>> (biIcePlains, biIcePlainsSpikes, 5, a_Seed + 99,
 			std::make_shared<cIntGenZoom           <7>> (a_Seed + 8,
 			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 10, 500, biDeepOcean,
 			std::make_shared<cIntGenBiomes         <7>> (a_Seed + 3000,
@@ -961,22 +963,26 @@ public:
 			std::make_shared<cIntGenBiomeGroupEdges<5>> (
 			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1003,
 			std::make_shared<cIntGenZoom           <9>> (a_Seed + 7,
+			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 8, 50, bgOcean,
 			std::make_shared<cIntGenReplaceRandomly<6>> (bgJungle, bgTemperate, 50, a_Seed + 100,
 			std::make_shared<cIntGenReplaceRandomly<6>> (bgIce,    bgTemperate, 50, a_Seed + 101,
+			std::make_shared<cIntGenReplaceRandomly<6>> (bgDesert, bgMesa,      30, a_Seed + 102,
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 70,
+			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
 			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
 			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
 			std::make_shared<cIntGenLandOcean      <6>> (a_Seed + 100, 65
-		)))))))))))))))))))))))));
+		)))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
 			std::make_shared<cIntGenZoom     <18>>(a_Seed,
-			std::make_shared<cIntGenSmooth   <11>>(a_Seed,
-			std::make_shared<cIntGenZoom     <13>>(a_Seed,
-			std::make_shared<cIntGenMixRivers<8>> (
+			std::make_shared<cIntGenZoom     <11>>(a_Seed,
+			std::make_shared<cIntGenSmooth   <7>>(a_Seed,
+			std::make_shared<cIntGenZoom     <9>>(a_Seed,
+			std::make_shared<cIntGenMixRivers<6>> (
 			FinalBiomes, FinalRivers
-		)))));
+		))))));
 	}
 
 	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
@@ -1000,6 +1006,94 @@ protected:
 
 
 
+////////////////////////////////////////////////////////////////////////////////
+// cBioGenGrown:
+
+class cBioGenProtGrown:
+	public cBiomeGen
+{
+public:
+	cBioGenProtGrown(int a_Seed)
+	{
+		auto FinalRivers =
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 3,
+			std::make_shared<cProtIntGenRiver >(a_Seed + 2,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 4,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 5,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 6,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 7,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 8,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 9,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 10,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 11,
+			std::make_shared<cProtIntGenChoice>(a_Seed + 12, 2
+		))))))))))));
+
+		auto FinalBiomes =
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1008,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 15,
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1000,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 16,
+			std::make_shared<cProtIntGenBeaches        >(
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1002,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 1,
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1002,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 2,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2004, 10,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 4,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 9, 10, biMushroomIsland,
+			std::make_shared<cProtIntGenReplaceRandomly>(biIcePlains, biIcePlainsSpikes, 5, a_Seed + 99,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 8,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cProtIntGenBiomes         >(a_Seed + 3000,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 5,
+			std::make_shared<cProtIntGenBiomeGroupEdges>(
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1003,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 7,
+			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 8, 50, bgOcean,
+			std::make_shared<cProtIntGenReplaceRandomly>(bgJungle, bgTemperate, 50, a_Seed + 100,
+			std::make_shared<cProtIntGenReplaceRandomly>(bgIce,    bgTemperate, 50, a_Seed + 101,
+			std::make_shared<cProtIntGenReplaceRandomly>(bgDesert, bgMesa,      30, a_Seed + 102,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 70,
+			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 9, 50, bgOcean,
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1004,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 10,
+			std::make_shared<cProtIntGenLandOcean      >(a_Seed + 100, 65
+		)))))))))))))))))))))))))))));
+
+		m_Gen =
+			std::make_shared<cProtIntGenSmooth   >(a_Seed,
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenSmooth   >(a_Seed,
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenMixRivers>(
+			FinalBiomes, FinalRivers
+		))))));
+	}
+
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
+	{
+		int vals[16 * 16];
+		m_Gen->GetInts(a_ChunkX * cChunkDef::Width, a_ChunkZ * cChunkDef::Width, 16, 16, vals);
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				cChunkDef::SetBiome(a_Biomes, x, z, (EMCSBiome)vals[x + cChunkDef::Width * z]);
+			}
+		}
+	}
+
+protected:
+	std::shared_ptr<cProtIntGen> m_Gen;
+};
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // cBiomeGen:
 
@@ -1040,6 +1134,10 @@ cBiomeGenPtr cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool &
 	{
 		res = new cBioGenGrown(a_Seed);
 	}
+	else if (NoCaseCompare(BiomeGenName, "grownprot") == 0)
+	{
+		res = new cBioGenProtGrown(a_Seed);
+	}
 	else
 	{
 		if (NoCaseCompare(BiomeGenName, "multistepmap") != 0)
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index afe30533e..1a26bd0d5 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -54,6 +54,7 @@ SET (HDRS
 	PieceGenerator.h
 	Prefab.h
 	PrefabPiecePool.h
+	ProtIntGen.h
 	RainbowRoadsGen.h
 	Ravines.h
 	RoughRavines.h
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index d7ed9275a..5f0394060 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -36,13 +36,14 @@ by using templates.
 
 
 /** Constants representing the biome group designators. */
-const int bgOcean     = 0;
-const int bgDesert    = 1;
-const int bgTemperate = 2;
-const int bgMountains = 3;
-const int bgJungle    = 4;
-const int bgIce       = 5;
-const int bgMax       = 5;  // Maximum biome group value
+const int bgOcean        = 0;
+const int bgDesert       = 1;
+const int bgTemperate    = 2;
+const int bgMountains    = 3;
+const int bgJungle       = 4;
+const int bgIce          = 5;
+const int bgLandOceanMax = 5;  // Maximum biome group value generated in the landOcean generator
+const int bgMesa         = 6;
 
 
 
@@ -167,7 +168,7 @@ public:
 			for (int x = 0; x < SizeX; x++)
 			{
 				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
-				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgMax + 1) : 0;
+				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgLandOceanMax + 1) : 0;
 			}
 		}
 
@@ -462,7 +463,7 @@ public:
 					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
 					if (rnd % 100 < m_Threshold)
 					{
-						a_Values[x + z * SizeX] = (rnd / 100) % bgMax;
+						a_Values[x + z * SizeX] = (rnd / 100) % bgLandOceanMax;
 					}
 				}
 			}
@@ -521,16 +522,16 @@ public:
 					case bgDesert:
 					{
 						if (
-							!IsDesertCompatible(Above) ||
-							!IsDesertCompatible(Below) ||
-							!IsDesertCompatible(Left) ||
-							!IsDesertCompatible(Right)
+							!isDesertCompatible(Above) ||
+							!isDesertCompatible(Below) ||
+							!isDesertCompatible(Left) ||
+							!isDesertCompatible(Right)
 						)
 						{
 							v = bgTemperate;
 						}
 						break;
-					}
+					}  // case bgDesert
 
 					// Ice should not neighbor deserts; change to temperate:
 					case bgIce:
@@ -545,21 +546,36 @@ public:
 							v = bgTemperate;
 						}
 						break;
-					}
+					}  // case bgIce
 
 					// Jungle should not neighbor Desert or Ice; change to temperate:
 					case bgJungle:
 					{
 						if (
-							!IsJungleCompatible(Above) ||
-							!IsJungleCompatible(Below) ||
-							!IsJungleCompatible(Left) ||
-							!IsJungleCompatible(Right)
+							!isJungleCompatible(Above) ||
+							!isJungleCompatible(Below) ||
+							!isJungleCompatible(Left) ||
+							!isJungleCompatible(Right)
 						)
 						{
 							v = bgTemperate;
 						}
-					}
+					}  // case bgJungle
+
+					// Mesa should neighbor only oceans and deserts; change to desert when another:
+					case bgMesa:
+					{
+						if (
+							!isMesaCompatible(Above) ||
+							!isMesaCompatible(Below) ||
+							!isMesaCompatible(Left) ||
+							!isMesaCompatible(Right)
+						)
+						{
+							v = bgDesert;
+						}
+						break;
+					}  // case bgDesert
 				}
 				a_Values[x + z * SizeX] = v;
 			}  // for x
@@ -570,14 +586,32 @@ protected:
 	Underlying m_Underlying;
 
 
-	inline bool IsDesertCompatible(int a_BiomeGroup)
+	inline bool isDesertCompatible(int a_BiomeGroup)
+	{
+		switch (a_BiomeGroup)
+		{
+			case bgOcean:
+			case bgDesert:
+			case bgTemperate:
+			case bgMesa:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+
+	inline bool isJungleCompatible(int a_BiomeGroup)
 	{
-		return ((a_BiomeGroup == bgOcean) || (a_BiomeGroup == bgDesert) || (a_BiomeGroup == bgTemperate));
+		return ((a_BiomeGroup != bgDesert) && (a_BiomeGroup != bgMesa) && (a_BiomeGroup != bgIce));
 	}
 
-	inline bool IsJungleCompatible(int a_BiomeGroup)
+	inline bool isMesaCompatible(int a_BiomeGroup)
 	{
-		return ((a_BiomeGroup != bgDesert) && (a_BiomeGroup != bgIce));
+		return ((a_BiomeGroup == bgOcean) || (a_BiomeGroup == bgDesert));
 	}
 };
 
@@ -605,44 +639,50 @@ public:
 	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Define the per-biome-group biomes:
-		static const int OceanBiomes[] =
+		static const int oceanBiomes[] =
 		{
 			biOcean, // biDeepOcean,
 		};
 
-		static const int DesertBiomes[] =
+		static const int desertBiomes[] =
 		{
-			biDesert, biDesert, biSavanna, biPlains,
+			biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
 		};
 
-		static const int TemperateBiomes[] =
+		static const int temperateBiomes[] =
 		{
-			biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
+			biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
 		};
 
-		static const int MountainBiomes[] =
+		static const int mountainBiomes[] =
 		{
 			biExtremeHills, biForest, biTaiga, biPlains,
 		};
 
-		static const int JungleBiomes[] =
+		static const int jungleBiomes[] =
+		{
+			biJungle, biJungle, biJungle, biForest,
+		};
+
+		static const int iceBiomes[] =
 		{
-			biJungle, biJungle, biForest,
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
 		};
 
-		static const int IceBiomes[] =
+		static const int mesaBiomes[] =
 		{
-			biIcePlains, biIcePlains, biColdTaiga,
+			biMesa, biMesaPlateau,
 		};
 
 		static const cBiomesInGroups BiomesInGroups[] =
 		{
-			{ static_cast<int>(ARRAYCOUNT(OceanBiomes)),     OceanBiomes},
-			{ static_cast<int>(ARRAYCOUNT(DesertBiomes)),    DesertBiomes},
-			{ static_cast<int>(ARRAYCOUNT(TemperateBiomes)), TemperateBiomes},
-			{ static_cast<int>(ARRAYCOUNT(MountainBiomes)),  MountainBiomes},
-			{ static_cast<int>(ARRAYCOUNT(JungleBiomes)),    JungleBiomes},
-			{ static_cast<int>(ARRAYCOUNT(IceBiomes)),       IceBiomes},
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(oceanBiomes)),     oceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(desertBiomes)),    desertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)),  mountainBiomes},
+			/* bgJungle */    { static_cast<int>(ARRAYCOUNT(jungleBiomes)),    jungleBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(iceBiomes)),       iceBiomes},
+			/* bgMesa */      { static_cast<int>(ARRAYCOUNT(mesaBiomes)),      mesaBiomes},
 		};
 
 		// Generate the underlying values, representing biome groups:
@@ -951,3 +991,56 @@ protected:
 
 
 
+
+/** Changes random pixels of the underlying data to the specified value. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenSetRandomly :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+	cIntGenSetRandomly(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Change random pixels to bgOcean:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					a_Values[x + z * SizeX] = m_ToValue;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel. */
+	int m_Chance;
+
+	/** The value to which to set the pixel. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
new file mode 100644
index 000000000..a3d10c4ef
--- /dev/null
+++ b/src/Generating/ProtIntGen.h
@@ -0,0 +1,1008 @@
+
+// ProtIntGen.h
+
+// Declares the prototyping integer generators - cProtIntGen class and its descendants
+
+/*
+These classes generate 2D arrays of integers that have various interpretations. The main purpose of these
+classes is to provide fast prototyping for cIntGen classes - unlike cIntGen classes, these are not
+template-based and so they take care of the underlying sizes automatically. This makes them easier to chain
+and re-chain, since the size parameters don't need to be adjusted after each such case. Their performance is,
+however, slightly worse, which is why we use cIntGen classes in the final generator.
+
+Because there is no SizeX / SizeZ template param, the generators would have to either alloc memory for each
+underlying generator's values, or use a maximum-size buffer. We chose the latter, to avoid memory allocation
+overhead; this however means that there's (an arbitrary) limit to the size of the generated data.
+*/
+
+
+
+
+
+#pragma once
+
+// We need the biome group constants defined there:
+#include "IntGen.h"
+
+
+
+
+
+/** Interface that all the generator classes provide. */
+class cProtIntGen
+{
+protected:
+	/** Maximum size of the generated area.
+	Adjust the constant if you need larger areas, these are just so that we can use fixed-size buffers. */
+	static const int m_BufferSize = 900;
+
+public:
+
+	/** Type of the generic interface used for storing links to the underlying generators. */
+	typedef std::shared_ptr<cProtIntGen> Underlying;
+
+
+	/** Force a virtual destructor in all descendants.
+	Descendants contain virtual functions and are referred to via pointer-to-base, so they need a virtual destructor. */
+	virtual ~cProtIntGen() {}
+
+	/** Generates the array of specified size into a_Values, based on given min coords. */
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) = 0;
+};
+
+
+
+
+
+/** Provides additional cNoise member and its helper functions. */
+class cProtIntGenWithNoise :
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenWithNoise(int a_Seed) :
+		m_Noise(a_Seed)
+	{
+	}
+
+protected:
+	cNoise m_Noise;
+
+	/** Chooses one of a_Val1 or a_Val2, based on m_Noise and the coordinates for querying the noise. */
+	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		return ((rnd & 1) == 0) ? a_Val1 : a_Val2;
+	}
+
+	/** Chooses one of a_ValN, based on m_Noise and the coordinates for querying the noise. */
+	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2, int a_Val3, int a_Val4)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		switch (rnd % 4)
+		{
+			case 0:  return a_Val1;
+			case 1:  return a_Val2;
+			case 2:  return a_Val3;
+			default: return a_Val4;
+		}
+	}
+};
+
+
+
+
+
+
+/** Generates a 2D array of random integers in the specified range [0 .. Range). */
+class cProtIntGenChoice :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenChoice(int a_Seed, int a_Range) :
+		super(a_Seed),
+		m_Range(a_Range)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				a_Values[x + a_SizeX * z] = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % m_Range;
+			}
+		}  // for z
+	}
+
+protected:
+	int m_Range;
+};
+
+
+
+
+
+
+/** Decides between the ocean and landmass biomes.
+Has a threshold (in percent) of how much land, the larger the threshold, the more land.
+Generates 0 for ocean, biome group ID for landmass. */
+class cProtIntGenLandOcean :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenLandOcean(int a_Seed, int a_Threshold) :
+		super(a_Seed),
+		m_Threshold(a_Threshold)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
+				a_Values[x + a_SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgLandOceanMax + 1) : 0;
+			}
+		}
+
+		// If the centerpoint of the world is within the area, set it to bgTemperate, always:
+		if ((a_MinX <= 0) && (a_MinZ <= 0) && (a_MinX + a_SizeX > 0) && (a_MinZ + a_SizeZ > 0))
+		{
+			a_Values[-a_MinX - a_MinZ * a_SizeX] = bgTemperate;
+		}
+	}
+
+protected:
+	int m_Threshold;
+};
+
+
+
+
+
+class cProtIntGenZoom :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenZoom(int a_Seed, Underlying a_UnderlyingGen) :
+		super(a_Seed),
+		m_UnderlyingGen(a_UnderlyingGen)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Get the coords for the lower generator:
+		int lowerMinX = a_MinX >> 1;
+		int lowerMinZ = a_MinZ >> 1;
+		int lowerSizeX = a_SizeX / 2 + 2;
+		int lowerSizeZ = a_SizeZ / 2 + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		ASSERT(lowerSizeX > 0);
+		ASSERT(lowerSizeZ > 0);
+
+		// Generate the underlying data with half the resolution:
+		int lowerData[m_BufferSize];
+		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, lowerSizeX, lowerSizeZ, lowerData);
+		const int lowStepX = (lowerSizeX - 1) * 2;
+		int Cache[m_BufferSize];
+
+		// Discreet-interpolate the values into twice the size:
+		for (int z = 0; z < lowerSizeZ - 1; ++z)
+		{
+			int idx = (z * 2) * lowStepX;
+			int PrevZ0 = lowerData[z * lowerSizeX];
+			int PrevZ1 = lowerData[(z + 1) * lowerSizeX];
+
+			for (int x = 0; x < lowerSizeX - 1; ++x)
+			{
+				int ValX1Z0 = lowerData[x + 1 + z * lowerSizeX];
+				int ValX1Z1 = lowerData[x + 1 + (z + 1) * lowerSizeX];
+				int RndX = (x + lowerMinX) * 2;
+				int RndZ = (z + lowerMinZ) * 2;
+				Cache[idx] = PrevZ0;
+				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, PrevZ1);
+				idx++;
+				Cache[idx] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0);
+				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				idx++;
+				PrevZ0 = ValX1Z0;
+				PrevZ1 = ValX1Z1;
+			}
+		}
+
+		// Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
+		for (int z = 0; z < a_SizeZ; ++z)
+		{
+			memcpy(a_Values + z * a_SizeX, Cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), a_SizeX * sizeof(int));
+		}
+	}
+
+protected:
+	Underlying m_UnderlyingGen;
+};
+
+
+
+
+
+class cProtIntGenSmooth :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenSmooth(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying values:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerData[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerData);
+
+		// Smooth - for each square check if the surroundings are the same, if so, expand them diagonally.
+		// Also get rid of single-pixel irregularities (A-B-A):
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int NoiseZ = a_MinZ + z;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val   = lowerData[x + 1 + (z + 1) * lowerSizeX];
+				int Above = lowerData[x + 1 +  z      * lowerSizeX];
+				int Below = lowerData[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerData[x     + (z + 1) * lowerSizeX];
+				int Right = lowerData[x + 2 + (z + 1) * lowerSizeX];
+
+				if ((Left == Right) && (Above == Below))
+				{
+					if (((super::m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
+					{
+						val = Left;
+					}
+					else
+					{
+						val = Above;
+					}
+				}
+				else
+				{
+					if (Left == Right)
+					{
+						val = Left;
+					}
+
+					if (Above == Below)
+					{
+						val = Above;
+					}
+				}
+
+				a_Values[x + z * a_SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+class cProtIntGenBeaches :
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenBeaches(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Map for biome -> its beach:
+		static const int ToBeach[] =
+		{
+			/* biOcean            */ biOcean,
+			/* biPlains           */ biBeach,
+			/* biDesert           */ biBeach,
+			/* biExtremeHills     */ biStoneBeach,
+			/* biForest           */ biBeach,
+			/* biTaiga            */ biColdBeach,
+			/* biSwampland        */ biSwampland,
+			/* biRiver            */ biRiver,
+			/* biNether           */ biNether,
+			/* biEnd              */ biEnd,
+			/* biFrozenOcean      */ biColdBeach,
+			/* biFrozenRiver      */ biColdBeach,
+			/* biIcePlains        */ biColdBeach,
+			/* biIceMountains     */ biColdBeach,
+			/* biMushroomIsland   */ biMushroomShore,
+			/* biMushroomShore    */ biMushroomShore,
+			/* biBeach            */ biBeach,
+			/* biDesertHills      */ biBeach,
+			/* biForestHills      */ biBeach,
+			/* biTaigaHills       */ biColdBeach,
+			/* biExtremeHillsEdge */ biStoneBeach,
+			/* biJungle           */ biBeach,
+			/* biJungleHills      */ biBeach,
+			/* biJungleEdge       */ biBeach,
+			/* biDeepOcean        */ biOcean,
+			/* biStoneBeach       */ biStoneBeach,
+			/* biColdBeach        */ biColdBeach,
+			/* biBirchForest      */ biBeach,
+			/* biBirchForestHills */ biBeach,
+			/* biRoofedForest     */ biBeach,
+			/* biColdTaiga        */ biColdBeach,
+			/* biColdTaigaHills   */ biColdBeach,
+			/* biMegaTaiga        */ biStoneBeach,
+			/* biMegaTaigaHills   */ biStoneBeach,
+			/* biExtremeHillsPlus */ biStoneBeach,
+			/* biSavanna          */ biBeach,
+			/* biSavannaPlateau   */ biBeach,
+			/* biMesa             */ biMesa,
+			/* biMesaPlateauF     */ biMesa,
+			/* biMesaPlateau      */ biMesa,
+		};
+
+		// Generate the underlying values:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Add beaches between ocean and biomes:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x     + (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					if (IsBiomeOcean(Above) || IsBiomeOcean(Below) || IsBiomeOcean(Left) || IsBiomeOcean(Right))
+					{
+						val = ToBeach[(val % 128) % ARRAYCOUNT(ToBeach)];
+					}
+				}
+				a_Values[x + z * a_SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Generates the underlying numbers and then randomly changes some zeroes into nonzeroes. */
+class cProtIntGenAddIslands :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	typedef std::shared_ptr<cProtIntGen> Underlying;
+
+
+	cProtIntGenAddIslands(int a_Seed, int a_Threshold, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Threshold(a_Threshold),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				if (a_Values[x + z * a_SizeX] == bgOcean)
+				{
+					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
+					if (rnd % 100 < m_Threshold)
+					{
+						a_Values[x + z * a_SizeX] = (rnd / 100) % bgLandOceanMax;
+					}
+				}
+			}
+		}
+	}
+
+protected:
+	int m_Threshold;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** A filter that adds an edge biome group between two biome groups that need an edge between them. */
+class cProtIntGenBiomeGroupEdges :
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenBiomeGroupEdges(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values)
+	{
+		// Generate the underlying biome groups:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX, a_MinZ, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Change the biomes on incompatible edges into an edge biome:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x     + (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				switch (val)
+				{
+					// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
+					case bgDesert:
+					{
+						if (
+							!isDesertCompatible(Above) ||
+							!isDesertCompatible(Below) ||
+							!isDesertCompatible(Left) ||
+							!isDesertCompatible(Right)
+						)
+						{
+							val = bgTemperate;
+						}
+						break;
+					}  // case bgDesert
+
+					// Ice should not neighbor deserts; change to temperate:
+					case bgIce:
+					{
+						if (
+							(Above == bgDesert) ||
+							(Below == bgDesert) ||
+							(Left  == bgDesert) ||
+							(Right == bgDesert)
+						)
+						{
+							val = bgTemperate;
+						}
+						break;
+					}  // case bgIce
+
+					// Jungle should not neighbor Desert or Ice; change to temperate:
+					case bgJungle:
+					{
+						if (
+							!isJungleCompatible(Above) ||
+							!isJungleCompatible(Below) ||
+							!isJungleCompatible(Left) ||
+							!isJungleCompatible(Right)
+						)
+						{
+							val = bgTemperate;
+						}
+					}  // case bgJungle
+
+					// Mesa should neighbor only oceans and deserts; change to desert when another:
+					case bgMesa:
+					{
+						if (
+							!isMesaCompatible(Above) ||
+							!isMesaCompatible(Below) ||
+							!isMesaCompatible(Left) ||
+							!isMesaCompatible(Right)
+						)
+						{
+							val = bgDesert;
+						}
+						break;
+					}  // case bgDesert
+				}
+				a_Values[x + z * a_SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+
+
+	inline bool isDesertCompatible(int a_BiomeGroup)
+	{
+		switch (a_BiomeGroup)
+		{
+			case bgOcean:
+			case bgDesert:
+			case bgTemperate:
+			case bgMesa:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+
+	inline bool isJungleCompatible(int a_BiomeGroup)
+	{
+		return ((a_BiomeGroup != bgDesert) && (a_BiomeGroup != bgMesa) && (a_BiomeGroup != bgIce));
+	}
+
+	inline bool isMesaCompatible(int a_BiomeGroup)
+	{
+		return ((a_BiomeGroup == bgOcean) || (a_BiomeGroup == bgDesert));
+	}
+};
+
+
+
+
+
+/** Turns biome group indices into real biomes.
+For each pixel, takes its biome group and chooses a random biome from that group; replaces the value with
+that biome. */
+class cProtIntGenBiomes :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenBiomes(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Define the per-biome-group biomes:
+		static const int oceanBiomes[] =
+		{
+			biOcean, // biDeepOcean,
+		};
+
+		static const int desertBiomes[] =
+		{
+			biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
+		};
+
+		static const int temperateBiomes[] =
+		{
+			biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
+		};
+
+		static const int mountainBiomes[] =
+		{
+			biExtremeHills, biForest, biTaiga, biPlains,
+		};
+
+		static const int jungleBiomes[] =
+		{
+			biJungle, biJungle, biJungle, biForest,
+		};
+
+		static const int iceBiomes[] =
+		{
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+		};
+
+		static const int mesaBiomes[] =
+		{
+			biMesa, biMesaPlateau,
+		};
+
+		static const cBiomesInGroups BiomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(oceanBiomes)),     oceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(desertBiomes)),    desertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)),  mountainBiomes},
+			/* bgJungle */    { static_cast<int>(ARRAYCOUNT(jungleBiomes)),    jungleBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(iceBiomes)),       iceBiomes},
+			/* bgMesa */      { static_cast<int>(ARRAYCOUNT(mesaBiomes)),      mesaBiomes},
+		};
+
+		// Generate the underlying values, representing biome groups:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Overwrite each biome group with a random biome from that group:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int IdxZ = z * a_SizeX;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val = a_Values[x + IdxZ];
+				const cBiomesInGroups & Biomes = BiomesInGroups[val % ARRAYCOUNT(BiomesInGroups)];
+				int rnd = (super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
+				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
+			}
+		}
+	}
+
+protected:
+
+	struct cBiomesInGroups
+	{
+		const int Count;
+		const int * Biomes;
+	};
+
+
+	/** The underlying int generator */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+class cProtIntGenReplaceRandomly :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	typedef std::shared_ptr<cProtIntGen> Underlying;
+
+
+	cProtIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_From(a_From),
+		m_To(a_To),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying values:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Replace some of the values:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int idxZ = z * a_SizeX;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (a_Values[idx] == m_From)
+				{
+					int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+					if (rnd % 100 < m_Chance)
+					{
+						a_Values[idx] = m_To;
+					}
+				}
+			}
+		}  // for z
+	}
+
+
+protected:
+	int m_From;
+	int m_To;
+	int m_Chance;
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Mixer that joins together finalized biomes and rivers.
+It first checks for oceans; if there's no ocean, it checks for a river. */
+class cProtIntGenMixRivers:
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers):
+		m_Biomes(a_Biomes),
+		m_Rivers(a_Rivers)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		ASSERT(a_SizeX * a_SizeZ <= m_BufferSize);
+		m_Biomes->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		int riverData[m_BufferSize];
+		m_Rivers->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, riverData);
+
+		// Mix the values:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int idxZ = z * a_SizeX;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (IsBiomeOcean(a_Values[idx]))
+				{
+					// Oceans are kept without any changes
+					continue;
+				}
+				if (riverData[idx] != biRiver)
+				{
+					// There's no river, keep the current value
+					continue;
+				}
+
+				// There's a river, change the output to a river or a frozen river, based on the original biome:
+				if (IsBiomeVeryCold((EMCSBiome)a_Values[idx]))
+				{
+					a_Values[idx] = biFrozenRiver;
+				}
+				else
+				{
+					a_Values[idx] = biRiver;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Biomes;
+	Underlying m_Rivers;
+};
+
+
+
+
+
+/** Generates a river based on the underlying data.
+This is basically an edge detector over the underlying data. The rivers are the edges where the underlying
+data changes from one pixel to its neighbor. */
+class cProtIntGenRiver:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenRiver(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Detect the edges:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x +     (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+
+				if ((val == Above) && (val == Below) && (val == Left) && (val == Right))
+				{
+					val = 0;
+				}
+				else
+				{
+					val = biRiver;
+				}
+				a_Values[x + z * a_SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Turns some of the oceans into the specified biome. Used for mushroom and deep ocean.
+The biome is only placed if at least 3 of its neighbors are ocean and only with the specified chance. */
+class cProtIntGenAddToOcean:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Add the mushroom islands:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					a_Values[x + z * a_SizeX] = val;
+					continue;
+				}
+
+				// Count the ocean neighbors:
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x +     (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				int NumOceanNeighbors = 0;
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Below))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Left))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Right))
+				{
+					NumOceanNeighbors += 1;
+				}
+
+				// If at least 3 ocean neighbors and the chance is right, change:
+				if (
+					(NumOceanNeighbors >= 3) &&
+					((super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance)
+				)
+				{
+					a_Values[x + z * a_SizeX] = m_ToValue;
+				}
+				else
+				{
+					a_Values[x + z * a_SizeX] = val;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	/** Chance, in permille, of changing the biome. */
+	int m_Chance;
+
+	/** The value to change the ocean into. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes random pixels of the underlying data to the specified value. */
+class cProtIntGenSetRandomly :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenSetRandomly(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Change random pixels to bgOcean:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					a_Values[x + z * a_SizeX] = m_ToValue;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel. */
+	int m_Chance;
+
+	/** The value to which to set the pixel. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
-- 
cgit v1.2.3


From d93acb841f5d78a25ced74e01c984c1604459e5e Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 30 Oct 2014 22:04:04 +0100
Subject: Fixed m_SentChunks list chunk removing.

---
 src/ClientHandle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index faee05450..94bace43a 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -557,7 +557,7 @@ void cClientHandle::UnloadOutOfRangeChunks(void)
 	for (cChunkCoordsList::iterator itr = ChunksToRemove.begin(); itr != ChunksToRemove.end(); ++itr)
 	{
 		m_Player->GetWorld()->RemoveChunkClient(itr->m_ChunkX, itr->m_ChunkZ, this);
-		m_Protocol->SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ);
+		SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ);
 	}
 }
 
-- 
cgit v1.2.3


From 13f0e93d690ef5ca96689190356b5c6c9cceb434 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 31 Oct 2014 12:52:07 +0100
Subject: GrownProt biomes: added alterations.

---
 src/Generating/BioGen.cpp   |  56 ++++++------
 src/Generating/IntGen.h     |  53 ++---------
 src/Generating/ProtIntGen.h | 213 ++++++++++++++++++++++++++++++++------------
 3 files changed, 192 insertions(+), 130 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index f9a0a571b..b3701a32a 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -964,15 +964,13 @@ public:
 			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1003,
 			std::make_shared<cIntGenZoom           <9>> (a_Seed + 7,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 8, 50, bgOcean,
-			std::make_shared<cIntGenReplaceRandomly<6>> (bgJungle, bgTemperate, 50, a_Seed + 100,
 			std::make_shared<cIntGenReplaceRandomly<6>> (bgIce,    bgTemperate, 50, a_Seed + 101,
-			std::make_shared<cIntGenReplaceRandomly<6>> (bgDesert, bgMesa,      30, a_Seed + 102,
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 70,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
 			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
 			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
 			std::make_shared<cIntGenLandOcean      <6>> (a_Seed + 100, 65
-		)))))))))))))))))))))))))))));
+		)))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
@@ -1017,60 +1015,66 @@ public:
 	{
 		auto FinalRivers =
 			std::make_shared<cProtIntGenSmooth>(a_Seed + 1,
-			std::make_shared<cProtIntGenZoom  >(a_Seed + 3,
-			std::make_shared<cProtIntGenRiver >(a_Seed + 2,
-			std::make_shared<cProtIntGenSmooth>(a_Seed + 4,
-			std::make_shared<cProtIntGenZoom  >(a_Seed + 5,
-			std::make_shared<cProtIntGenZoom  >(a_Seed + 6,
-			std::make_shared<cProtIntGenZoom  >(a_Seed + 7,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 2,
+			std::make_shared<cProtIntGenRiver >(a_Seed + 3,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 4,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 8,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 9,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 10,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 11,
 			std::make_shared<cProtIntGenChoice>(a_Seed + 12, 2
-		))))))))))));
+		))))))))))))));
+
+		auto alteration =
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenLandOcean>(a_Seed, 20
+		));
 
 		auto FinalBiomes =
-			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1008,
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 15,
-			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1000,
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 16,
 			std::make_shared<cProtIntGenBeaches        >(
-			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1002,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 1,
-			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1002,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 2,
 			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2004, 10,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 1, biPlains, biSunflowerPlains, 20,
+			std::make_shared<cProtIntGenAlternateBiomes>(a_Seed + 1, alteration,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 4,
-			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 9, 10, biMushroomIsland,
-			std::make_shared<cProtIntGenReplaceRandomly>(biIcePlains, biIcePlainsSpikes, 5, a_Seed + 99,
+			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 99, biIcePlains, biIcePlainsSpikes, 50,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 8,
-			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 300, biDeepOcean,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 9, 8, biMushroomIsland,
 			std::make_shared<cProtIntGenBiomes         >(a_Seed + 3000,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 200,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 5,
+			std::make_shared<cProtIntGenRareBiomeGroups>(a_Seed + 5, 50,
 			std::make_shared<cProtIntGenBiomeGroupEdges>(
-			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1003,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 200,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 7,
 			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 8, 50, bgOcean,
-			std::make_shared<cProtIntGenReplaceRandomly>(bgJungle, bgTemperate, 50, a_Seed + 100,
-			std::make_shared<cProtIntGenReplaceRandomly>(bgIce,    bgTemperate, 50, a_Seed + 101,
-			std::make_shared<cProtIntGenReplaceRandomly>(bgDesert, bgMesa,      30, a_Seed + 102,
-			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 70,
+			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 101, bgIce, bgTemperate, 150,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 200,
 			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 9, 50, bgOcean,
-			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1004,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 10,
-			std::make_shared<cProtIntGenLandOcean      >(a_Seed + 100, 65
+			std::make_shared<cProtIntGenLandOcean      >(a_Seed + 100, 30
 		)))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cProtIntGenSmooth   >(a_Seed,
 			std::make_shared<cProtIntGenZoom     >(a_Seed,
-			std::make_shared<cProtIntGenZoom     >(a_Seed,
 			std::make_shared<cProtIntGenSmooth   >(a_Seed,
 			std::make_shared<cProtIntGenZoom     >(a_Seed,
 			std::make_shared<cProtIntGenMixRivers>(
 			FinalBiomes, FinalRivers
-		))))));
+		)))));
 	}
 
 	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 5f0394060..15a5c9157 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -8,13 +8,13 @@ The integers generated may be interpreted in several ways:
 - land/see designators
 	- 0 = ocean
 	- >0 = land
-- biome group designators
+- biome group
 	- 0 = ocean
 	- 1 = desert biomes
 	- 2 = temperate biomes
 	- 3 = mountains (hills and forests)
-	- 4 = jungle
-	- 5 = ice biomes
+	- 4 = ice biomes
+- biome group with "bgfRare" flag (for generating rare biomes for the group)
 - biome IDs
 The interpretation depends on the generator used and on the position in the chain.
 
@@ -40,10 +40,9 @@ const int bgOcean        = 0;
 const int bgDesert       = 1;
 const int bgTemperate    = 2;
 const int bgMountains    = 3;
-const int bgJungle       = 4;
-const int bgIce          = 5;
-const int bgLandOceanMax = 5;  // Maximum biome group value generated in the landOcean generator
-const int bgMesa         = 6;
+const int bgIce          = 4;
+const int bgLandOceanMax = 4;  // Maximum biome group value generated in the landOcean generator
+const int bgfRare        = 1024;  // Flag added to values to generate rare biomes for the group
 
 
 
@@ -547,35 +546,6 @@ public:
 						}
 						break;
 					}  // case bgIce
-
-					// Jungle should not neighbor Desert or Ice; change to temperate:
-					case bgJungle:
-					{
-						if (
-							!isJungleCompatible(Above) ||
-							!isJungleCompatible(Below) ||
-							!isJungleCompatible(Left) ||
-							!isJungleCompatible(Right)
-						)
-						{
-							v = bgTemperate;
-						}
-					}  // case bgJungle
-
-					// Mesa should neighbor only oceans and deserts; change to desert when another:
-					case bgMesa:
-					{
-						if (
-							!isMesaCompatible(Above) ||
-							!isMesaCompatible(Below) ||
-							!isMesaCompatible(Left) ||
-							!isMesaCompatible(Right)
-						)
-						{
-							v = bgDesert;
-						}
-						break;
-					}  // case bgDesert
 				}
 				a_Values[x + z * SizeX] = v;
 			}  // for x
@@ -593,7 +563,6 @@ protected:
 			case bgOcean:
 			case bgDesert:
 			case bgTemperate:
-			case bgMesa:
 			{
 				return true;
 			}
@@ -603,16 +572,6 @@ protected:
 			}
 		}
 	}
-
-	inline bool isJungleCompatible(int a_BiomeGroup)
-	{
-		return ((a_BiomeGroup != bgDesert) && (a_BiomeGroup != bgMesa) && (a_BiomeGroup != bgIce));
-	}
-
-	inline bool isMesaCompatible(int a_BiomeGroup)
-	{
-		return ((a_BiomeGroup == bgOcean) || (a_BiomeGroup == bgDesert));
-	}
 };
 
 
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
index a3d10c4ef..e2b3e592a 100644
--- a/src/Generating/ProtIntGen.h
+++ b/src/Generating/ProtIntGen.h
@@ -154,7 +154,7 @@ public:
 			for (int x = 0; x < a_SizeX; x++)
 			{
 				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
-				a_Values[x + a_SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgLandOceanMax + 1) : 0;
+				a_Values[x + a_SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 101) % bgLandOceanMax + 1) : 0;
 			}
 		}
 
@@ -410,7 +410,8 @@ protected:
 
 
 
-/** Generates the underlying numbers and then randomly changes some zeroes into nonzeroes. */
+/** Generates the underlying numbers and then randomly changes some ocean group pixels into random land
+group pixels, based on the predefined chance. */
 class cProtIntGenAddIslands :
 	public cProtIntGenWithNoise
 {
@@ -420,9 +421,9 @@ public:
 	typedef std::shared_ptr<cProtIntGen> Underlying;
 
 
-	cProtIntGenAddIslands(int a_Seed, int a_Threshold, Underlying a_Underlying) :
+	cProtIntGenAddIslands(int a_Seed, int a_Chance, Underlying a_Underlying) :
 		super(a_Seed),
-		m_Threshold(a_Threshold),
+		m_Chance(a_Chance),
 		m_Underlying(a_Underlying)
 	{
 	}
@@ -438,9 +439,9 @@ public:
 				if (a_Values[x + z * a_SizeX] == bgOcean)
 				{
 					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
-					if (rnd % 100 < m_Threshold)
+					if (rnd % 1000 < m_Chance)
 					{
-						a_Values[x + z * a_SizeX] = (rnd / 100) % bgLandOceanMax;
+						a_Values[x + z * a_SizeX] = (rnd / 101) % bgLandOceanMax;
 					}
 				}
 			}
@@ -448,7 +449,8 @@ public:
 	}
 
 protected:
-	int m_Threshold;
+	/** Chance of each ocean pixel being converted, in permille. */
+	int m_Chance;
 
 	Underlying m_Underlying;
 };
@@ -520,35 +522,6 @@ public:
 						}
 						break;
 					}  // case bgIce
-
-					// Jungle should not neighbor Desert or Ice; change to temperate:
-					case bgJungle:
-					{
-						if (
-							!isJungleCompatible(Above) ||
-							!isJungleCompatible(Below) ||
-							!isJungleCompatible(Left) ||
-							!isJungleCompatible(Right)
-						)
-						{
-							val = bgTemperate;
-						}
-					}  // case bgJungle
-
-					// Mesa should neighbor only oceans and deserts; change to desert when another:
-					case bgMesa:
-					{
-						if (
-							!isMesaCompatible(Above) ||
-							!isMesaCompatible(Below) ||
-							!isMesaCompatible(Left) ||
-							!isMesaCompatible(Right)
-						)
-						{
-							val = bgDesert;
-						}
-						break;
-					}  // case bgDesert
 				}
 				a_Values[x + z * a_SizeX] = val;
 			}  // for x
@@ -566,7 +539,6 @@ protected:
 			case bgOcean:
 			case bgDesert:
 			case bgTemperate:
-			case bgMesa:
 			{
 				return true;
 			}
@@ -576,16 +548,6 @@ protected:
 			}
 		}
 	}
-
-	inline bool isJungleCompatible(int a_BiomeGroup)
-	{
-		return ((a_BiomeGroup != bgDesert) && (a_BiomeGroup != bgMesa) && (a_BiomeGroup != bgIce));
-	}
-
-	inline bool isMesaCompatible(int a_BiomeGroup)
-	{
-		return ((a_BiomeGroup == bgOcean) || (a_BiomeGroup == bgDesert));
-	}
 };
 
 
@@ -616,24 +578,40 @@ public:
 			biOcean, // biDeepOcean,
 		};
 
+		// Same as oceanBiomes, there are no rare oceanic biomes (mushroom islands are handled separately)
+		static const int rareOceanBiomes[] =
+		{
+			biOcean,
+		};
+
 		static const int desertBiomes[] =
 		{
 			biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
 		};
 
+		static const int rareDesertBiomes[] =
+		{
+			biMesaPlateau, biMesaPlateauF,
+		};
+
 		static const int temperateBiomes[] =
 		{
 			biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
 		};
 
+		static const int rareTemperateBiomes[] =
+		{
+			biJungle,  // Jungle is not strictly temperate, but let's piggyback it here
+		};
+
 		static const int mountainBiomes[] =
 		{
 			biExtremeHills, biForest, biTaiga, biPlains,
 		};
 
-		static const int jungleBiomes[] =
+		static const int rareMountainBiomes[] =
 		{
-			biJungle, biJungle, biJungle, biForest,
+			biMegaTaiga,
 		};
 
 		static const int iceBiomes[] =
@@ -641,33 +619,44 @@ public:
 			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
 		};
 
-		static const int mesaBiomes[] =
+		// Same as iceBiomes, there's no rare ice biome
+		static const int rareIceBiomes[] =
 		{
-			biMesa, biMesaPlateau,
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
 		};
 
-		static const cBiomesInGroups BiomesInGroups[] =
+		static const cBiomesInGroups biomesInGroups[] =
 		{
 			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(oceanBiomes)),     oceanBiomes},
 			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(desertBiomes)),    desertBiomes},
 			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
 			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)),  mountainBiomes},
-			/* bgJungle */    { static_cast<int>(ARRAYCOUNT(jungleBiomes)),    jungleBiomes},
 			/* bgIce */       { static_cast<int>(ARRAYCOUNT(iceBiomes)),       iceBiomes},
-			/* bgMesa */      { static_cast<int>(ARRAYCOUNT(mesaBiomes)),      mesaBiomes},
+		};
+
+		static const cBiomesInGroups rareBiomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(rareOceanBiomes)),     rareOceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(rareDesertBiomes)),    rareDesertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(rareTemperateBiomes)), rareTemperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(rareMountainBiomes)),  rareMountainBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(rareIceBiomes)),       rareIceBiomes},
 		};
 
 		// Generate the underlying values, representing biome groups:
 		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
 
 		// Overwrite each biome group with a random biome from that group:
+		// Take care of the bgfRare flag
 		for (int z = 0; z < a_SizeZ; z++)
 		{
 			int IdxZ = z * a_SizeX;
 			for (int x = 0; x < a_SizeX; x++)
 			{
 				int val = a_Values[x + IdxZ];
-				const cBiomesInGroups & Biomes = BiomesInGroups[val % ARRAYCOUNT(BiomesInGroups)];
+				const cBiomesInGroups & Biomes = (val > bgfRare) ?
+					rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)] :
+					biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
 				int rnd = (super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
 				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
 			}
@@ -700,7 +689,7 @@ public:
 	typedef std::shared_ptr<cProtIntGen> Underlying;
 
 
-	cProtIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying) :
+	cProtIntGenReplaceRandomly(int a_Seed, int a_From, int a_To, int a_Chance, Underlying a_Underlying) :
 		super(a_Seed),
 		m_From(a_From),
 		m_To(a_To),
@@ -725,7 +714,7 @@ public:
 				if (a_Values[idx] == m_From)
 				{
 					int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
-					if (rnd % 100 < m_Chance)
+					if (rnd % 1000 < m_Chance)
 					{
 						a_Values[idx] = m_To;
 					}
@@ -1006,3 +995,113 @@ protected:
 
 
 
+
+/** Adds a "rare" flag to random biome groups, based on the given chance. */
+class cProtIntGenRareBiomeGroups:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenRareBiomeGroups(int a_Seed, int a_Chance, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Change some of the biome groups into rare biome groups:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					int idx = x + a_SizeX * z;
+					a_Values[idx] = a_Values[idx] | bgfRare;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel into the rare biome group. */
+	int m_Chance;
+
+	/** The underlying generator. */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes biomes in the parent data into their alternate verions ("M" variants), in such places that
+have their alterations set. */
+class cProtIntGenAlternateBiomes:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenAlternateBiomes(int a_Seed, Underlying a_Alterations, Underlying a_BaseBiomes):
+		super(a_Seed),
+		m_Alterations(a_Alterations),
+		m_BaseBiomes(a_BaseBiomes)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the base biomes and the alterations:
+		m_BaseBiomes->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		int alterations[m_BufferSize];
+		m_Alterations->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, alterations);
+
+		// Change the biomes into their alternate versions:
+		int len = a_SizeX * a_SizeZ;
+		for (int idx = 0; idx < len; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				// No change
+				continue;
+			}
+
+			// Change to alternate biomes:
+			int val = a_Values[idx];
+			switch (val)
+			{
+				case biBirchForest:  val = biBirchForest;      break;
+				case biDesert:       val = biDesertHills;      break;
+				case biExtremeHills: val = biExtremeHillsPlus; break;
+				case biForest:       val = biForestHills;      break;
+				case biIcePlains:    val = biIceMountains;     break;
+				case biJungle:       val = biJungleHills;      break;
+				case biMegaTaiga:    val = biMegaTaigaHills;   break;
+				case biMesaPlateau:  val = biMesa;             break;
+				case biPlains:       val = biForest;           break;
+				case biRoofedForest: val = biPlains;           break;
+				case biSavanna:      val = biSavannaPlateau;   break;
+				case biTaiga:        val = biTaigaHills;       break;
+			}
+			a_Values[idx] = val;
+		}  // for idx - a_Values[]
+	}
+
+protected:
+	Underlying m_Alterations;
+	Underlying m_BaseBiomes;
+};
+
+
+
+
-- 
cgit v1.2.3


From e2ffd5429c22753916b207f5fea5a01a65a31987 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 31 Oct 2014 19:23:47 +0100
Subject: Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea().

---
 src/ChunkMap.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 595040a54..8a8f17a1b 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -822,6 +822,7 @@ void cChunkMap::WakeUpSimulatorsInArea(int a_MinBlockX, int a_MaxBlockX, int a_M
 	int MinChunkX, MinChunkZ, MaxChunkX, MaxChunkZ;
 	cChunkDef::BlockToChunk(a_MinBlockX, a_MinBlockZ, MinChunkX, MinChunkZ);
 	cChunkDef::BlockToChunk(a_MaxBlockX, a_MaxBlockZ, MaxChunkX, MaxChunkZ);
+	cCSLock Lock(m_CSLayers);
 	for (int z = MinChunkZ; z <= MaxChunkZ; z++)
 	{
 		int MinZ = std::max(a_MinBlockZ, z * cChunkDef::Width);
-- 
cgit v1.2.3


From 2b7f34515a837ea02ebd19be3326b490f33ad012 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 31 Oct 2014 19:25:31 +0100
Subject: cLuaState: Fixed errors on non-existent callbacks.

This mostly affected table-based callbacks, such as the cLineBlockTracer. If a callback didn't exist, the code would still push its arguments on the stack, breaking the next callback.
---
 src/Bindings/LuaState.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index d1e9923b4..c13e36188 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -247,7 +247,11 @@ public:
 	template <typename FnT, typename... Args>
 	bool Call(const FnT & a_Function, Args &&... args)
 	{
-		PushFunction(a_Function);
+		if (!PushFunction(a_Function))
+		{
+			// Pushing the function failed
+			return false;
+		}
 		return PushCallPop(args...);
 	}
 
-- 
cgit v1.2.3


From 4873890cfbb0c1a2ede464c44ffb58bfe4a1c1cd Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sat, 1 Nov 2014 16:37:56 +0100
Subject: GrownProt biome gen: Added biome edges.

---
 src/Generating/BioGen.cpp   |   5 +-
 src/Generating/ProtIntGen.h | 159 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index b3701a32a..e4a3a3629 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -1042,11 +1042,12 @@ public:
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 16,
 			std::make_shared<cProtIntGenBeaches        >(
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 1,
-			std::make_shared<cProtIntGenZoom           >(a_Seed + 2,
 			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2004, 10,
 			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 500, biDeepOcean,
 			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 1, biPlains, biSunflowerPlains, 20,
 			std::make_shared<cProtIntGenAlternateBiomes>(a_Seed + 1, alteration,
+			std::make_shared<cProtIntGenBiomeEdges     >(a_Seed + 3,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 2,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 4,
 			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 99, biIcePlains, biIcePlainsSpikes, 50,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 8,
@@ -1065,7 +1066,7 @@ public:
 			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 9, 50, bgOcean,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 10,
 			std::make_shared<cProtIntGenLandOcean      >(a_Seed + 100, 30
-		)))))))))))))))))))))))))))));
+		))))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cProtIntGenSmooth   >(a_Seed,
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
index e2b3e592a..c523d9d52 100644
--- a/src/Generating/ProtIntGen.h
+++ b/src/Generating/ProtIntGen.h
@@ -1088,6 +1088,7 @@ public:
 				case biJungle:       val = biJungleHills;      break;
 				case biMegaTaiga:    val = biMegaTaigaHills;   break;
 				case biMesaPlateau:  val = biMesa;             break;
+				case biMesaPlateauF: val = biMesa;             break;
 				case biPlains:       val = biForest;           break;
 				case biRoofedForest: val = biPlains;           break;
 				case biSavanna:      val = biSavannaPlateau;   break;
@@ -1105,3 +1106,161 @@ protected:
 
 
 
+
+/** Adds an edge between two specifically incompatible biomes, such as mesa and forest. */
+class cProtIntGenBiomeEdges:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenBiomeEdges(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying biomes:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Convert incompatible edges into neutral biomes:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int biome = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				int above = lowerValues[x + 1 + z *       lowerSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int left  = lowerValues[x +     (z + 1) * lowerSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+
+				switch (biome)
+				{
+					case biDesert:
+					case biDesertM:
+					case biDesertHills:
+					{
+						if (
+							IsBiomeVeryCold(static_cast<EMCSBiome>(above)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(below)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(left))  ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // case biDesert
+
+					case biMesaPlateau:
+					case biMesaPlateauF:
+					case biMesaPlateauFM:
+					case biMesaPlateauM:
+					{
+						if (
+							!isMesaCompatible(above) ||
+							!isMesaCompatible(below) ||
+							!isMesaCompatible(left)  ||
+							!isMesaCompatible(right)
+						)
+						{
+							biome = biDesert;
+						}
+						break;
+					}  // Mesa biomes
+
+					case biJungle:
+					case biJungleM:
+					{
+						if (
+							!isJungleCompatible(above) ||
+							!isJungleCompatible(below) ||
+							!isJungleCompatible(left)  ||
+							!isJungleCompatible(right)
+						)
+						{
+							biome = (biome == biJungle) ? biJungleEdge : biJungleEdgeM;
+						}
+						break;
+					}  // Jungle biomes
+
+					case biSwampland:
+					case biSwamplandM:
+					{
+						if (
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(above)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(below)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(left))  ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // Swampland biomes
+				}  // switch (biome)
+
+				a_Values[x + z * a_SizeX] = biome;
+			}  // for x
+		}  // for z
+	}
+
+
+protected:
+	Underlying m_Underlying;
+
+
+	bool isMesaCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biDesert:
+			case biMesa:
+			case biMesaBryce:
+			case biMesaPlateau:
+			case biMesaPlateauF:
+			case biMesaPlateauFM:
+			case biMesaPlateauM:
+			case biOcean:
+			case biDeepOcean:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+
+
+	bool isJungleCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biJungle:
+			case biJungleM:
+			case biJungleEdge:
+			case biJungleEdgeM:
+			case biJungleHills:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+};
+
+
+
+
-- 
cgit v1.2.3


From d868346491cf35ea9d52d60786904b0552d9d67c Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sat, 1 Nov 2014 21:01:33 +0100
Subject: GrownProt: Added the rest of rare and M biomes.

---
 src/Generating/BioGen.cpp   | 11 +++++-
 src/Generating/ProtIntGen.h | 94 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 91 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index e4a3a3629..dc5f715ca 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -1035,6 +1035,14 @@ public:
 			std::make_shared<cProtIntGenLandOcean>(a_Seed, 20
 		));
 
+		auto alteration2 =
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 2,
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 2,
+			std::make_shared<cProtIntGenLandOcean>(a_Seed + 1, 10
+		)))));
+
 		auto FinalBiomes =
 			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 15,
@@ -1045,6 +1053,7 @@ public:
 			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2004, 10,
 			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 500, biDeepOcean,
 			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 1, biPlains, biSunflowerPlains, 20,
+			std::make_shared<cProtIntGenMBiomes        >(a_Seed + 5, alteration2,
 			std::make_shared<cProtIntGenAlternateBiomes>(a_Seed + 1, alteration,
 			std::make_shared<cProtIntGenBiomeEdges     >(a_Seed + 3,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 2,
@@ -1066,7 +1075,7 @@ public:
 			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 9, 50, bgOcean,
 			std::make_shared<cProtIntGenZoom           >(a_Seed + 10,
 			std::make_shared<cProtIntGenLandOcean      >(a_Seed + 100, 30
-		))))))))))))))))))))))))))))));
+		)))))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cProtIntGenSmooth   >(a_Seed,
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
index c523d9d52..9c3eb36cc 100644
--- a/src/Generating/ProtIntGen.h
+++ b/src/Generating/ProtIntGen.h
@@ -1080,19 +1080,21 @@ public:
 			int val = a_Values[idx];
 			switch (val)
 			{
-				case biBirchForest:  val = biBirchForest;      break;
-				case biDesert:       val = biDesertHills;      break;
-				case biExtremeHills: val = biExtremeHillsPlus; break;
-				case biForest:       val = biForestHills;      break;
-				case biIcePlains:    val = biIceMountains;     break;
-				case biJungle:       val = biJungleHills;      break;
-				case biMegaTaiga:    val = biMegaTaigaHills;   break;
-				case biMesaPlateau:  val = biMesa;             break;
-				case biMesaPlateauF: val = biMesa;             break;
-				case biPlains:       val = biForest;           break;
-				case biRoofedForest: val = biPlains;           break;
-				case biSavanna:      val = biSavannaPlateau;   break;
-				case biTaiga:        val = biTaigaHills;       break;
+				case biBirchForest:   val = biBirchForest;      break;
+				case biDesert:        val = biDesertHills;      break;
+				case biExtremeHills:  val = biExtremeHillsPlus; break;
+				case biForest:        val = biForestHills;      break;
+				case biIcePlains:     val = biIceMountains;     break;
+				case biJungle:        val = biJungleHills;      break;
+				case biMegaTaiga:     val = biMegaTaigaHills;   break;
+				case biMesaPlateau:   val = biMesa;             break;
+				case biMesaPlateauF:  val = biMesa;             break;
+				case biMesaPlateauM:  val = biMesa;             break;
+				case biMesaPlateauFM: val = biMesa;             break;
+				case biPlains:        val = biForest;           break;
+				case biRoofedForest:  val = biPlains;           break;
+				case biSavanna:       val = biSavannaPlateau;   break;
+				case biTaiga:         val = biTaigaHills;       break;
 			}
 			a_Values[idx] = val;
 		}  // for idx - a_Values[]
@@ -1264,3 +1266,69 @@ protected:
 
 
 
+
+class cProtIntGenMBiomes:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenMBiomes(int a_Seed, Underlying a_Alteration, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying),
+		m_Alteration(a_Alteration)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying biomes and the alterations:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		int alterations[m_BufferSize];
+		m_Alteration->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, alterations);
+
+		// Wherever alterations are nonzero, change into alternate biome, if available:
+		int len = a_SizeX * a_SizeZ;
+		for (int idx = 0; idx < len; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				continue;
+			}
+
+			// Ice spikes biome was removed from here, because it was generated way too often
+			switch (a_Values[idx])
+			{
+				case biPlains:               a_Values[idx] = biSunflowerPlains;      break;
+				case biDesert:               a_Values[idx] = biDesertM;              break;
+				case biExtremeHills:         a_Values[idx] = biExtremeHillsM;        break;
+				case biForest:               a_Values[idx] = biFlowerForest;         break;
+				case biTaiga:                a_Values[idx] = biTaigaM;               break;
+				case biSwampland:            a_Values[idx] = biSwamplandM;           break;
+				case biJungle:               a_Values[idx] = biJungleM;              break;
+				case biJungleEdge:           a_Values[idx] = biJungleEdgeM;          break;
+				case biBirchForest:          a_Values[idx] = biBirchForestM;         break;
+				case biBirchForestHills:     a_Values[idx] = biBirchForestHillsM;    break;
+				case biRoofedForest:         a_Values[idx] = biRoofedForestM;        break;
+				case biColdTaiga:            a_Values[idx] = biColdTaigaM;           break;
+				case biMegaSpruceTaiga:      a_Values[idx] = biMegaSpruceTaiga;      break;
+				case biMegaSpruceTaigaHills: a_Values[idx] = biMegaSpruceTaigaHills; break;
+				case biExtremeHillsPlus:     a_Values[idx] = biExtremeHillsPlusM;    break;
+				case biSavanna:              a_Values[idx] = biSavannaM;             break;
+				case biSavannaPlateau:       a_Values[idx] = biSavannaPlateauM;      break;
+				case biMesa:                 a_Values[idx] = biMesaBryce;            break;
+				case biMesaPlateauF:         a_Values[idx] = biMesaPlateauFM;        break;
+				case biMesaPlateau:          a_Values[idx] = biMesaBryce;            break;
+			}
+		}  // for idx - a_Values[] / alterations[]
+	}
+
+protected:
+	Underlying m_Underlying;
+	Underlying m_Alteration;
+};
+
+
+
+
-- 
cgit v1.2.3


From d5b6353493868ac14b277155f398bd87f08c484c Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 2 Nov 2014 16:36:59 +0100
Subject: Grown biomes: Unified with GrownProt biomes.

Also fixed a Zoom filter randomness.
---
 src/Generating/BioGen.cpp   | 104 ++++----
 src/Generating/IntGen.h     | 567 +++++++++++++++++++++++++++++++++++++-------
 src/Generating/ProtIntGen.h |  83 ++++---
 3 files changed, 595 insertions(+), 159 deletions(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index dc5f715ca..0f2b0a73d 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -928,59 +928,77 @@ public:
 	cBioGenGrown(int a_Seed)
 	{
 		auto FinalRivers =
-			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 1,
-			std::make_shared<cIntGenZoom  <8>>  (a_Seed + 3,
-			std::make_shared<cIntGenRiver <6>>   (a_Seed + 2,
-			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 4,
-			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 5,
-			std::make_shared<cIntGenZoom  <7>>   (a_Seed + 6,
-			std::make_shared<cIntGenZoom  <5>>   (a_Seed + 7,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 8,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 9,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 10,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 11,
-			std::make_shared<cIntGenChoice<2, 4>>(a_Seed + 12
-		))))))))))));
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 1,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 2,
+			std::make_shared<cIntGenRiver <7>>   (a_Seed + 3,
+			std::make_shared<cIntGenZoom  <9>>   (a_Seed + 4,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 8,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 9,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 10,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 6,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 11,
+			std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12
+		))))))))))))));
+
+		auto alteration =
+			std::make_shared<cIntGenZoom     <8>>(a_Seed,
+			std::make_shared<cIntGenLandOcean<6>>(a_Seed, 20
+		));
+
+		auto alteration2 =
+			std::make_shared<cIntGenZoom     <8>>(a_Seed + 1,
+			std::make_shared<cIntGenZoom     <6>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom     <5>>(a_Seed + 1,
+			std::make_shared<cIntGenZoom     <4>>(a_Seed + 2,
+			std::make_shared<cIntGenLandOcean<4>>(a_Seed + 1, 10
+		)))));
 
 		auto FinalBiomes =
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1008,
-			std::make_shared<cIntGenZoom           <8>>(a_Seed + 15,
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1000,
-			std::make_shared<cIntGenZoom           <8>> (a_Seed + 16,
+			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 15,
+			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1,
+			std::make_shared<cIntGenZoom           <9>> (a_Seed + 16,
 			std::make_shared<cIntGenBeaches        <6>> (
-			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1002,
-			std::make_shared<cIntGenZoom           <10>>(a_Seed + 1,
-			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1002,
-			std::make_shared<cIntGenZoom           <9>> (a_Seed + 2,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 1,
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2004, 10,
-			std::make_shared<cIntGenZoom           <6>> (a_Seed + 4,
-			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 9, 10, biMushroomIsland,
-			std::make_shared<cIntGenReplaceRandomly<7>> (biIcePlains, biIcePlainsSpikes, 5, a_Seed + 99,
-			std::make_shared<cIntGenZoom           <7>> (a_Seed + 8,
-			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 10, 500, biDeepOcean,
-			std::make_shared<cIntGenBiomes         <7>> (a_Seed + 3000,
-			std::make_shared<cIntGenZoom           <7>> (a_Seed + 5,
-			std::make_shared<cIntGenBiomeGroupEdges<5>> (
-			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1003,
-			std::make_shared<cIntGenZoom           <9>> (a_Seed + 7,
+			std::make_shared<cIntGenAddToOcean     <6>> (a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cIntGenReplaceRandomly<8>> (a_Seed + 1, biPlains, biSunflowerPlains, 20,
+			std::make_shared<cIntGenMBiomes        <8>> (a_Seed + 5, alteration2,
+			std::make_shared<cIntGenAlternateBiomes<8>> (a_Seed + 1, alteration,
+			std::make_shared<cIntGenBiomeEdges     <8>> (a_Seed + 3,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom           <7>> (a_Seed + 4,
+			std::make_shared<cIntGenReplaceRandomly<5>> (a_Seed + 99, biIcePlains, biIcePlainsSpikes, 50,
+			std::make_shared<cIntGenZoom           <5>> (a_Seed + 8,
+			std::make_shared<cIntGenAddToOcean     <4>> (a_Seed + 10, 300, biDeepOcean,
+			std::make_shared<cIntGenAddToOcean     <6>> (a_Seed + 9, 8, biMushroomIsland,
+			std::make_shared<cIntGenBiomes         <8>> (a_Seed + 3000,
+			std::make_shared<cIntGenAddIslands     <8>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 5,
+			std::make_shared<cIntGenRareBiomeGroups<6>> (a_Seed + 5, 50,
+			std::make_shared<cIntGenBiomeGroupEdges<6>> (
+			std::make_shared<cIntGenAddIslands     <8>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 7,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 8, 50, bgOcean,
-			std::make_shared<cIntGenReplaceRandomly<6>> (bgIce,    bgTemperate, 50, a_Seed + 101,
-			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 70,
+			std::make_shared<cIntGenReplaceRandomly<6>> (a_Seed + 101, bgIce, bgTemperate, 150,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 200,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
-			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
-			std::make_shared<cIntGenLandOcean      <6>> (a_Seed + 100, 65
-		)))))))))))))))))))))))))));
+			std::make_shared<cIntGenZoom           <6>> (a_Seed + 10,
+			std::make_shared<cIntGenLandOcean      <5>> (a_Seed + 100, 30
+		)))))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
 			std::make_shared<cIntGenZoom     <18>>(a_Seed,
-			std::make_shared<cIntGenZoom     <11>>(a_Seed,
-			std::make_shared<cIntGenSmooth   <7>>(a_Seed,
-			std::make_shared<cIntGenZoom     <9>>(a_Seed,
-			std::make_shared<cIntGenMixRivers<6>> (
+			std::make_shared<cIntGenSmooth   <11>>(a_Seed,
+			std::make_shared<cIntGenZoom     <13>>(a_Seed,
+			std::make_shared<cIntGenMixRivers<8>> (
 			FinalBiomes, FinalRivers
-		))))));
+		)))));
 	}
 
 	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
@@ -1025,7 +1043,7 @@ public:
 			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 10,
 			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
-			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 6,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 11,
 			std::make_shared<cProtIntGenChoice>(a_Seed + 12, 2
 		))))))))))))));
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 15a5c9157..83a0e569a 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -167,7 +167,7 @@ public:
 			for (int x = 0; x < SizeX; x++)
 			{
 				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
-				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 128) % bgLandOceanMax + 1) : 0;
+				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 101) % bgLandOceanMax + 1) : 0;
 			}
 		}
 
@@ -186,6 +186,9 @@ protected:
 
 
 
+/** Zooms the underlying value array to twice the size. Uses random-neighbor for the pixels in-between.
+This means that the zoome out image is randomly distorted. Applying zoom several times provides all
+the distortion that the generators need. */
 template <int SizeX, int SizeZ = SizeX>
 class cIntGenZoom :
 	public cIntGenWithNoise<SizeX, SizeZ>
@@ -212,31 +215,30 @@ public:
 		// Generate the underlying data with half the resolution:
 		int lowerMinX = a_MinX >> 1;
 		int lowerMinZ = a_MinZ >> 1;
-		int Underlying[m_LowerSizeX * m_LowerSizeZ];
-		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, Underlying);
+		int lowerData[m_LowerSizeX * m_LowerSizeZ];
+		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, lowerData);
 		const int lowStepX = (m_LowerSizeX - 1) * 2;
 		const int lowStepZ = (m_LowerSizeZ - 1) * 2;
-		int Cache[lowStepX * lowStepZ];
+		int cache[lowStepX * lowStepZ];
 
 		// Discreet-interpolate the values into twice the size:
 		for (int z = 0; z < m_LowerSizeZ - 1; ++z)
 		{
 			int idx = (z * 2) * lowStepX;
-			int PrevZ0 = Underlying[z * m_LowerSizeX];
-			int PrevZ1 = Underlying[(z + 1) * m_LowerSizeX];
+			int PrevZ0 = lowerData[z * m_LowerSizeX];
+			int PrevZ1 = lowerData[(z + 1) * m_LowerSizeX];
 
 			for (int x = 0; x < m_LowerSizeX - 1; ++x)
 			{
-				int ValX1Z0 = Underlying[x + 1 + z * m_LowerSizeX];
-				int ValX1Z1 = Underlying[x + 1 + (z + 1) * m_LowerSizeX];
+				int ValX1Z0 = lowerData[x + 1 + z * m_LowerSizeX];
+				int ValX1Z1 = lowerData[x + 1 + (z + 1) * m_LowerSizeX];
 				int RndX = (x + lowerMinX) * 2;
 				int RndZ = (z + lowerMinZ) * 2;
-				Cache[idx] = PrevZ0;
-				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, PrevZ1);
-				idx++;
-				Cache[idx] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0);
-				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
-				idx++;
+				cache[idx] = PrevZ0;
+				cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ + 1, PrevZ0, PrevZ1);
+				cache[idx + 1]        = super::ChooseRandomOne(RndX, RndZ - 1, PrevZ0, ValX1Z0);
+				cache[idx + 1 + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				idx += 2;
 				PrevZ0 = ValX1Z0;
 				PrevZ1 = ValX1Z1;
 			}
@@ -245,7 +247,7 @@ public:
 		// Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
 		for (int z = 0; z < SizeZ; ++z)
 		{
-			memcpy(a_Values + z * SizeX, Cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), SizeX * sizeof(int));
+			memcpy(a_Values + z * SizeX, cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), SizeX * sizeof(int));
 		}
 	}
 
@@ -257,16 +259,18 @@ protected:
 
 
 
+/** Smoothes out some artifacts generated by the zooming - mostly single-pixel values.
+Compares each pixel to its neighbors and if the neighbors are equal, changes the pixel to their value. */
 template <int SizeX, int SizeZ = SizeX>
 class cIntGenSmooth :
 	public cIntGenWithNoise<SizeX, SizeZ>
 {
 	typedef cIntGenWithNoise<SizeX, SizeZ> super;
-	static const int UnderlyingSizeX = SizeX + 2;
-	static const int UnderlyingSizeZ = SizeZ + 2;
+	static const int m_LowerSizeX = SizeX + 2;
+	static const int m_LowerSizeZ = SizeZ + 2;
 
 public:
-	typedef std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>> Underlying;
+	typedef std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>> Underlying;
 
 
 	cIntGenSmooth(int a_Seed, Underlying a_Underlying) :
@@ -279,8 +283,8 @@ public:
 	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying values:
-		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
-		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+		int lowerData[m_LowerSizeX * m_LowerSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerData);
 
 		// Smooth - for each square check if the surroundings are the same, if so, expand them diagonally.
 		// Also get rid of single-pixel irregularities (A-B-A):
@@ -289,33 +293,33 @@ public:
 			int NoiseZ = a_MinZ + z;
 			for (int x = 0; x < SizeX; x++)
 			{
-				int val   = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
-				int Above = Cache[x + 1 +  z      * UnderlyingSizeX];
-				int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
-				int Left  = Cache[x     + (z + 1) * UnderlyingSizeX];
-				int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
+				int val   = lowerData[x + 1 + (z + 1) * m_LowerSizeX];
+				int above = lowerData[x + 1 +  z      * m_LowerSizeX];
+				int below = lowerData[x + 1 + (z + 2) * m_LowerSizeX];
+				int left  = lowerData[x     + (z + 1) * m_LowerSizeX];
+				int right = lowerData[x + 2 + (z + 1) * m_LowerSizeX];
 
-				if ((Left == Right) && (Above == Below))
+				if ((left == right) && (above == below))
 				{
 					if (((super::m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
 					{
-						val = Left;
+						val = left;
 					}
 					else
 					{
-						val = Above;
+						val = above;
 					}
 				}
 				else
 				{
-					if (Left == Right)
+					if (left == right)
 					{
-						val = Left;
+						val = left;
 					}
 
-					if (Above == Below)
+					if (above == below)
 					{
-						val = Above;
+						val = above;
 					}
 				}
 
@@ -332,7 +336,8 @@ protected:
 
 
 
-template<int SizeX, int SizeZ = SizeX>
+/** Converts land biomes at the edge of an ocean into the respective beach biome. */
+template <int SizeX, int SizeZ = SizeX>
 class cIntGenBeaches :
 	public cIntGen<SizeX, SizeZ>
 {
@@ -398,23 +403,24 @@ public:
 		};
 
 		// Generate the underlying values:
-		int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ];
-		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+		int lowerValues[m_UnderlyingSizeX * m_UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerValues);
 
 		// Add beaches between ocean and biomes:
 		for (int z = 0; z < SizeZ; z++)
 		{
 			for (int x = 0; x < SizeX; x++)
 			{
-				int val = Cache[x + 1 + (z + 1) * m_UnderlyingSizeX];
-				int Above = Cache[x + 1 + z * m_UnderlyingSizeX];
-				int Below = Cache[x + 1 + (z + 2) * m_UnderlyingSizeX];
-				int Left  = Cache[x     + (z + 1) * m_UnderlyingSizeX];
-				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				int val   = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int above = lowerValues[x + 1 + z       * m_UnderlyingSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int left  = lowerValues[x     + (z + 1) * m_UnderlyingSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * m_UnderlyingSizeX];
 				if (!IsBiomeOcean(val))
 				{
-					if (IsBiomeOcean(Above) || IsBiomeOcean(Below) || IsBiomeOcean(Left) || IsBiomeOcean(Right))
+					if (IsBiomeOcean(above) || IsBiomeOcean(below) || IsBiomeOcean(left) || IsBiomeOcean(right))
 					{
+						// First convert the value to a regular biome (drop the M flag), then modulo by our biome count:
 						val = ToBeach[(val % 128) % ARRAYCOUNT(ToBeach)];
 					}
 				}
@@ -431,7 +437,8 @@ protected:
 
 
 
-/** Generates the underlying numbers and then randomly changes some zeroes into nonzeroes. */
+/** Generates the underlying numbers and then randomly changes some ocean group pixels into random land
+biome group pixels, based on the predefined chance. */
 template <int SizeX, int SizeZ = SizeX>
 class cIntGenAddIslands :
 	public cIntGenWithNoise<SizeX, SizeZ>
@@ -442,9 +449,9 @@ public:
 	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
 
 
-	cIntGenAddIslands(int a_Seed, int a_Threshold, Underlying a_Underlying) :
+	cIntGenAddIslands(int a_Seed, int a_Chance, Underlying a_Underlying) :
 		super(a_Seed),
-		m_Threshold(a_Threshold),
+		m_Chance(a_Chance),
 		m_Underlying(a_Underlying)
 	{
 	}
@@ -460,17 +467,18 @@ public:
 				if (a_Values[x + z * SizeX] == bgOcean)
 				{
 					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
-					if (rnd % 100 < m_Threshold)
+					if (rnd % 1000 < m_Chance)
 					{
-						a_Values[x + z * SizeX] = (rnd / 100) % bgLandOceanMax;
+						a_Values[x + z * SizeX] = (rnd / 1003) % bgLandOceanMax;
 					}
 				}
-			}
-		}
+			}  // for x
+		}  // for z
 	}
 
 protected:
-	int m_Threshold;
+	/** Chance, in permille, of an island being generated in ocean. */
+	int m_Chance;
 
 	Underlying m_Underlying;
 };
@@ -502,32 +510,32 @@ public:
 	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values)
 	{
 		// Generate the underlying biome groups:
-		int Cache[m_UnderlyingSizeX * m_UnderlyingSizeZ];
-		m_Underlying->GetInts(a_MinX, a_MinZ, Cache);
+		int lowerValues[m_UnderlyingSizeX * m_UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX, a_MinZ, lowerValues);
 
 		// Change the biomes on incompatible edges into an edge biome:
 		for (int z = 0; z < SizeZ; z++)
 		{
 			for (int x = 0; x < SizeX; x++)
 			{
-				int v = Cache[x + 1 + (z + 1) * m_UnderlyingSizeX];
-				int Above = Cache[x + 1 + z * m_UnderlyingSizeX];
-				int Below = Cache[x + 1 + (z + 2) * m_UnderlyingSizeX];
-				int Left  = Cache[x     + (z + 1) * m_UnderlyingSizeX];
-				int Right = Cache[x + 2 + (z + 1) * m_UnderlyingSizeX];
-				switch (v)
+				int val   = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int above = lowerValues[x + 1 + z       * m_UnderlyingSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int left  = lowerValues[x     + (z + 1) * m_UnderlyingSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				switch (val)
 				{
 					// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
 					case bgDesert:
 					{
 						if (
-							!isDesertCompatible(Above) ||
-							!isDesertCompatible(Below) ||
-							!isDesertCompatible(Left) ||
-							!isDesertCompatible(Right)
+							!isDesertCompatible(above) ||
+							!isDesertCompatible(below) ||
+							!isDesertCompatible(left) ||
+							!isDesertCompatible(right)
 						)
 						{
-							v = bgTemperate;
+							val = bgTemperate;
 						}
 						break;
 					}  // case bgDesert
@@ -536,18 +544,18 @@ public:
 					case bgIce:
 					{
 						if (
-							(Above == bgDesert) ||
-							(Below == bgDesert) ||
-							(Left == bgDesert) ||
-							(Right == bgDesert)
+							(above == bgDesert) ||
+							(below == bgDesert) ||
+							(left  == bgDesert) ||
+							(right == bgDesert)
 						)
 						{
-							v = bgTemperate;
+							val = bgTemperate;
 						}
 						break;
 					}  // case bgIce
 				}
-				a_Values[x + z * SizeX] = v;
+				a_Values[x + z * SizeX] = val;
 			}  // for x
 		}  // for z
 	}
@@ -578,6 +586,9 @@ protected:
 
 
 
+/** Turns biome group indices into real biomes.
+For each pixel, takes its biome group and chooses a random biome from that group; replaces the value with
+that biome. */
 template <int SizeX, int SizeZ = SizeX>
 class cIntGenBiomes :
 	public cIntGenWithNoise<SizeX, SizeZ>
@@ -600,7 +611,13 @@ public:
 		// Define the per-biome-group biomes:
 		static const int oceanBiomes[] =
 		{
-			biOcean, // biDeepOcean,
+			biOcean,  // biDeepOcean,
+		};
+
+		// Same as oceanBiomes, there are no rare oceanic biomes (mushroom islands are handled separately)
+		static const int rareOceanBiomes[] =
+		{
+			biOcean,
 		};
 
 		static const int desertBiomes[] =
@@ -608,19 +625,29 @@ public:
 			biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
 		};
 
+		static const int rareDesertBiomes[] =
+		{
+			biMesaPlateau, biMesaPlateauF,
+		};
+
 		static const int temperateBiomes[] =
 		{
 			biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
 		};
 
+		static const int rareTemperateBiomes[] =
+		{
+			biJungle,  // Jungle is not strictly temperate, but let's piggyback it here
+		};
+
 		static const int mountainBiomes[] =
 		{
 			biExtremeHills, biForest, biTaiga, biPlains,
 		};
 
-		static const int jungleBiomes[] =
+		static const int rareMountainBiomes[] =
 		{
-			biJungle, biJungle, biJungle, biForest,
+			biMegaTaiga,
 		};
 
 		static const int iceBiomes[] =
@@ -628,20 +655,28 @@ public:
 			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
 		};
 
-		static const int mesaBiomes[] =
+		// Same as iceBiomes, there's no rare ice biome
+		static const int rareIceBiomes[] =
 		{
-			biMesa, biMesaPlateau,
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
 		};
 
-		static const cBiomesInGroups BiomesInGroups[] =
+		static const cBiomesInGroups biomesInGroups[] =
 		{
 			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(oceanBiomes)),     oceanBiomes},
 			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(desertBiomes)),    desertBiomes},
 			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
 			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)),  mountainBiomes},
-			/* bgJungle */    { static_cast<int>(ARRAYCOUNT(jungleBiomes)),    jungleBiomes},
 			/* bgIce */       { static_cast<int>(ARRAYCOUNT(iceBiomes)),       iceBiomes},
-			/* bgMesa */      { static_cast<int>(ARRAYCOUNT(mesaBiomes)),      mesaBiomes},
+		};
+
+		static const cBiomesInGroups rareBiomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(rareOceanBiomes)),     rareOceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(rareDesertBiomes)),    rareDesertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(rareTemperateBiomes)), rareTemperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(rareMountainBiomes)),  rareMountainBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(rareIceBiomes)),       rareIceBiomes},
 		};
 
 		// Generate the underlying values, representing biome groups:
@@ -654,7 +689,9 @@ public:
 			for (int x = 0; x < SizeX; x++)
 			{
 				int val = a_Values[x + IdxZ];
-				const cBiomesInGroups & Biomes = BiomesInGroups[val % ARRAYCOUNT(BiomesInGroups)];
+				const cBiomesInGroups & Biomes = (val > bgfRare) ?
+					rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)] :
+					biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
 				int rnd = (super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
 				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
 			}
@@ -678,6 +715,7 @@ protected:
 
 
 
+/** Randomly replaces pixels of one value to another value, using the given chance. */
 template <int SizeX, int SizeZ = SizeX>
 class cIntGenReplaceRandomly :
 	public cIntGenWithNoise<SizeX, SizeZ>
@@ -713,7 +751,7 @@ public:
 				if (a_Values[idx] == m_From)
 				{
 					int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
-					if (rnd % 100 < m_Chance)
+					if (rnd % 1000 < m_Chance)
 					{
 						a_Values[idx] = m_To;
 					}
@@ -724,9 +762,15 @@ public:
 
 
 protected:
+	/** The original value to be replaced. */
 	int m_From;
+
+	/** The destination value to which to replace. */
 	int m_To;
+
+	/** Chance, in permille, of replacing the value. */
 	int m_Chance;
+
 	Underlying m_Underlying;
 };
 
@@ -735,7 +779,9 @@ protected:
 
 
 /** Mixer that joins together finalized biomes and rivers.
-It first checks for oceans; if there's no ocean, it checks for a river. */
+It first checks for oceans, if there is an ocean in the Biomes, it keeps the ocean.
+If there's no ocean, it checks Rivers for a river, if there is a river, it uses the Biomes to select either
+regular river or frozen river, based on the biome. */
 template <int SizeX, int SizeZ = SizeX>
 class cIntGenMixRivers:
 	public cIntGen<SizeX, SizeZ>
@@ -757,8 +803,8 @@ public:
 	{
 		// Generate the underlying data:
 		m_Biomes->GetInts(a_MinX, a_MinZ, a_Values);
-		typename super::Values Rivers;
-		m_Rivers->GetInts(a_MinX, a_MinZ, Rivers);
+		typename super::Values riverData;
+		m_Rivers->GetInts(a_MinX, a_MinZ, riverData);
 
 		// Mix the values:
 		for (int z = 0; z < SizeZ; z++)
@@ -772,7 +818,7 @@ public:
 					// Oceans are kept without any changes
 					continue;
 				}
-				if (Rivers[idx] != biRiver)
+				if (riverData[idx] != biRiver)
 				{
 					// There's no river, keep the current value
 					continue;
@@ -925,7 +971,10 @@ public:
 				}
 
 				// If at least 3 ocean neighbors and the chance is right, change:
-				if ((NumOceanNeighbors >= 3) && ((super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance))
+				if (
+					(NumOceanNeighbors >= 3) &&
+					((super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance)
+				)
 				{
 					a_Values[x + z * SizeX] = m_ToValue;
 				}
@@ -1003,3 +1052,355 @@ protected:
 
 
 
+
+/** Adds a "rare" flag to random biome groups, based on the given chance. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenRareBiomeGroups:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenRareBiomeGroups(int a_Seed, int a_Chance, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Change some of the biome groups into rare biome groups:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					int idx = x + SizeX * z;
+					a_Values[idx] = a_Values[idx] | bgfRare;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel into the rare biome group. */
+	int m_Chance;
+
+	/** The underlying generator. */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes biomes in the parent data into an alternate versions (usually "hill" variants), in such places
+that have their alterations set. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenAlternateBiomes:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenAlternateBiomes(int a_Seed, Underlying a_Alterations, Underlying a_BaseBiomes):
+		super(a_Seed),
+		m_Alterations(a_Alterations),
+		m_BaseBiomes(a_BaseBiomes)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the base biomes and the alterations:
+		m_BaseBiomes->GetInts(a_MinX, a_MinZ, a_Values);
+		super::Values alterations;
+		m_Alterations->GetInts(a_MinX, a_MinZ, alterations);
+
+		// Change the biomes into their alternate versions:
+		for (int idx = 0; idx < SizeX * SizeZ; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				// No change
+				continue;
+			}
+
+			// Change to alternate biomes:
+			int val = a_Values[idx];
+			switch (val)
+			{
+				case biBirchForest:   val = biBirchForestHills; break;
+				case biDesert:        val = biDesertHills;      break;
+				case biExtremeHills:  val = biExtremeHillsPlus; break;
+				case biForest:        val = biForestHills;      break;
+				case biIcePlains:     val = biIceMountains;     break;
+				case biJungle:        val = biJungleHills;      break;
+				case biMegaTaiga:     val = biMegaTaigaHills;   break;
+				case biMesaPlateau:   val = biMesa;             break;
+				case biMesaPlateauF:  val = biMesa;             break;
+				case biMesaPlateauM:  val = biMesa;             break;
+				case biMesaPlateauFM: val = biMesa;             break;
+				case biPlains:        val = biForest;           break;
+				case biRoofedForest:  val = biPlains;           break;
+				case biSavanna:       val = biSavannaPlateau;   break;
+				case biTaiga:         val = biTaigaHills;       break;
+			}
+			a_Values[idx] = val;
+		}  // for idx - a_Values[]
+	}
+
+protected:
+	Underlying m_Alterations;
+	Underlying m_BaseBiomes;
+};
+
+
+
+
+
+/** Adds an edge between two specifically incompatible biomes, such as mesa and forest. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBiomeEdges:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int m_LowerSizeX = SizeX + 2;
+	static const int m_LowerSizeZ = SizeZ + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>> Underlying;
+
+
+	cIntGenBiomeEdges(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying biomes:
+		Underlying::element_type::Values lowerValues;
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerValues);
+
+		// Convert incompatible edges into neutral biomes:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int biome = lowerValues[x + 1 + (z + 1) * m_LowerSizeX];
+				int above = lowerValues[x + 1 + z *       m_LowerSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * m_LowerSizeX];
+				int left  = lowerValues[x +     (z + 1) * m_LowerSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * m_LowerSizeX];
+
+				switch (biome)
+				{
+					case biDesert:
+					case biDesertM:
+					case biDesertHills:
+					{
+						if (
+							IsBiomeVeryCold(static_cast<EMCSBiome>(above)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(below)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(left))  ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // case biDesert
+
+					case biMesaPlateau:
+					case biMesaPlateauF:
+					case biMesaPlateauFM:
+					case biMesaPlateauM:
+					{
+						if (
+							!isMesaCompatible(above) ||
+							!isMesaCompatible(below) ||
+							!isMesaCompatible(left)  ||
+							!isMesaCompatible(right)
+						)
+						{
+							biome = biDesert;
+						}
+						break;
+					}  // Mesa biomes
+
+					case biJungle:
+					case biJungleM:
+					{
+						if (
+							!isJungleCompatible(above) ||
+							!isJungleCompatible(below) ||
+							!isJungleCompatible(left)  ||
+							!isJungleCompatible(right)
+						)
+						{
+							biome = (biome == biJungle) ? biJungleEdge : biJungleEdgeM;
+						}
+						break;
+					}  // Jungle biomes
+
+					case biSwampland:
+					case biSwamplandM:
+					{
+						if (
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(above)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(below)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(left))  ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // Swampland biomes
+				}  // switch (biome)
+
+				a_Values[x + z * SizeX] = biome;
+			}  // for x
+		}  // for z
+	}
+
+
+protected:
+	Underlying m_Underlying;
+
+
+	bool isMesaCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biDesert:
+			case biMesa:
+			case biMesaBryce:
+			case biMesaPlateau:
+			case biMesaPlateauF:
+			case biMesaPlateauFM:
+			case biMesaPlateauM:
+			case biOcean:
+			case biDeepOcean:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+
+
+	bool isJungleCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biJungle:
+			case biJungleM:
+			case biJungleEdge:
+			case biJungleEdgeM:
+			case biJungleHills:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+};
+
+
+
+
+
+/** Changes biomes in the parent data into their alternate versions ("M" variants), in such places that
+have their alterations set. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenMBiomes:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenMBiomes(int a_Seed, Underlying a_Alteration, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying),
+		m_Alteration(a_Alteration)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying biomes and the alterations:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+		super::Values alterations;
+		m_Alteration->GetInts(a_MinX, a_MinZ, alterations);
+
+		// Wherever alterations are nonzero, change into alternate biome, if available:
+		for (int idx = 0; idx < SizeX * SizeZ; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				continue;
+			}
+
+			// Ice spikes biome was removed from here, because it was generated way too often
+			switch (a_Values[idx])
+			{
+				case biPlains:               a_Values[idx] = biSunflowerPlains;      break;
+				case biDesert:               a_Values[idx] = biDesertM;              break;
+				case biExtremeHills:         a_Values[idx] = biExtremeHillsM;        break;
+				case biForest:               a_Values[idx] = biFlowerForest;         break;
+				case biTaiga:                a_Values[idx] = biTaigaM;               break;
+				case biSwampland:            a_Values[idx] = biSwamplandM;           break;
+				case biJungle:               a_Values[idx] = biJungleM;              break;
+				case biJungleEdge:           a_Values[idx] = biJungleEdgeM;          break;
+				case biBirchForest:          a_Values[idx] = biBirchForestM;         break;
+				case biBirchForestHills:     a_Values[idx] = biBirchForestHillsM;    break;
+				case biRoofedForest:         a_Values[idx] = biRoofedForestM;        break;
+				case biColdTaiga:            a_Values[idx] = biColdTaigaM;           break;
+				case biMegaSpruceTaiga:      a_Values[idx] = biMegaSpruceTaiga;      break;
+				case biMegaSpruceTaigaHills: a_Values[idx] = biMegaSpruceTaigaHills; break;
+				case biExtremeHillsPlus:     a_Values[idx] = biExtremeHillsPlusM;    break;
+				case biSavanna:              a_Values[idx] = biSavannaM;             break;
+				case biSavannaPlateau:       a_Values[idx] = biSavannaPlateauM;      break;
+				case biMesa:                 a_Values[idx] = biMesaBryce;            break;
+				case biMesaPlateauF:         a_Values[idx] = biMesaPlateauFM;        break;
+				case biMesaPlateau:          a_Values[idx] = biMesaBryce;            break;
+			}
+		}  // for idx - a_Values[] / alterations[]
+	}
+
+protected:
+	Underlying m_Underlying;
+	Underlying m_Alteration;
+};
+
+
+
+
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
index 9c3eb36cc..73ed27096 100644
--- a/src/Generating/ProtIntGen.h
+++ b/src/Generating/ProtIntGen.h
@@ -70,14 +70,14 @@ protected:
 	cNoise m_Noise;
 
 	/** Chooses one of a_Val1 or a_Val2, based on m_Noise and the coordinates for querying the noise. */
-	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2)
+	int chooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2)
 	{
 		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
 		return ((rnd & 1) == 0) ? a_Val1 : a_Val2;
 	}
 
 	/** Chooses one of a_ValN, based on m_Noise and the coordinates for querying the noise. */
-	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2, int a_Val3, int a_Val4)
+	int chooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2, int a_Val3, int a_Val4)
 	{
 		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
 		switch (rnd % 4)
@@ -173,6 +173,9 @@ protected:
 
 
 
+/** Zooms the underlying value array to twice the size. Uses random-neighbor for the pixels in-between.
+This means that the zoome out image is randomly distorted. Applying zoom several times provides all
+the distortion that the generators need. */
 class cProtIntGenZoom :
 	public cProtIntGenWithNoise
 {
@@ -201,7 +204,7 @@ public:
 		int lowerData[m_BufferSize];
 		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, lowerSizeX, lowerSizeZ, lowerData);
 		const int lowStepX = (lowerSizeX - 1) * 2;
-		int Cache[m_BufferSize];
+		int cache[m_BufferSize];
 
 		// Discreet-interpolate the values into twice the size:
 		for (int z = 0; z < lowerSizeZ - 1; ++z)
@@ -216,12 +219,11 @@ public:
 				int ValX1Z1 = lowerData[x + 1 + (z + 1) * lowerSizeX];
 				int RndX = (x + lowerMinX) * 2;
 				int RndZ = (z + lowerMinZ) * 2;
-				Cache[idx] = PrevZ0;
-				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, PrevZ1);
-				idx++;
-				Cache[idx] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0);
-				Cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
-				idx++;
+				cache[idx] = PrevZ0;
+				cache[idx + lowStepX] = super::chooseRandomOne(RndX, RndZ + 1, PrevZ0, PrevZ1);
+				cache[idx + 1]        = super::chooseRandomOne(RndX, RndZ - 1, PrevZ0, ValX1Z0);
+				cache[idx + 1 + lowStepX] = super::chooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				idx += 2;
 				PrevZ0 = ValX1Z0;
 				PrevZ1 = ValX1Z1;
 			}
@@ -230,7 +232,7 @@ public:
 		// Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
 		for (int z = 0; z < a_SizeZ; ++z)
 		{
-			memcpy(a_Values + z * a_SizeX, Cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), a_SizeX * sizeof(int));
+			memcpy(a_Values + z * a_SizeX, cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), a_SizeX * sizeof(int));
 		}
 	}
 
@@ -242,6 +244,8 @@ protected:
 
 
 
+/** Smoothes out some artifacts generated by the zooming - mostly single-pixel values.
+Compares each pixel to its neighbors and if the neighbors are equal, changes the pixel to their value. */
 class cProtIntGenSmooth :
 	public cProtIntGenWithNoise
 {
@@ -272,32 +276,32 @@ public:
 			for (int x = 0; x < a_SizeX; x++)
 			{
 				int val   = lowerData[x + 1 + (z + 1) * lowerSizeX];
-				int Above = lowerData[x + 1 +  z      * lowerSizeX];
-				int Below = lowerData[x + 1 + (z + 2) * lowerSizeX];
-				int Left  = lowerData[x     + (z + 1) * lowerSizeX];
-				int Right = lowerData[x + 2 + (z + 1) * lowerSizeX];
+				int above = lowerData[x + 1 +  z      * lowerSizeX];
+				int below = lowerData[x + 1 + (z + 2) * lowerSizeX];
+				int left  = lowerData[x     + (z + 1) * lowerSizeX];
+				int right = lowerData[x + 2 + (z + 1) * lowerSizeX];
 
-				if ((Left == Right) && (Above == Below))
+				if ((left == right) && (above == below))
 				{
 					if (((super::m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
 					{
-						val = Left;
+						val = left;
 					}
 					else
 					{
-						val = Above;
+						val = above;
 					}
 				}
 				else
 				{
-					if (Left == Right)
+					if (left == right)
 					{
-						val = Left;
+						val = left;
 					}
 
-					if (Above == Below)
+					if (above == below)
 					{
-						val = Above;
+						val = above;
 					}
 				}
 
@@ -314,6 +318,7 @@ protected:
 
 
 
+/** Converts land biomes at the edge of an ocean into the respective beach biome. */
 class cProtIntGenBeaches :
 	public cProtIntGen
 {
@@ -386,14 +391,15 @@ public:
 			for (int x = 0; x < a_SizeX; x++)
 			{
 				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
-				int Above = lowerValues[x + 1 + z       * lowerSizeX];
-				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
-				int Left  = lowerValues[x     + (z + 1) * lowerSizeX];
-				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				int above = lowerValues[x + 1 + z       * lowerSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int left  = lowerValues[x     + (z + 1) * lowerSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
 				if (!IsBiomeOcean(val))
 				{
-					if (IsBiomeOcean(Above) || IsBiomeOcean(Below) || IsBiomeOcean(Left) || IsBiomeOcean(Right))
+					if (IsBiomeOcean(above) || IsBiomeOcean(below) || IsBiomeOcean(left) || IsBiomeOcean(right))
 					{
+						// First convert the value to a regular biome (drop the M flag), then modulo by our biome count:
 						val = ToBeach[(val % 128) % ARRAYCOUNT(ToBeach)];
 					}
 				}
@@ -411,7 +417,7 @@ protected:
 
 
 /** Generates the underlying numbers and then randomly changes some ocean group pixels into random land
-group pixels, based on the predefined chance. */
+biome group pixels, based on the predefined chance. */
 class cProtIntGenAddIslands :
 	public cProtIntGenWithNoise
 {
@@ -441,7 +447,7 @@ public:
 					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
 					if (rnd % 1000 < m_Chance)
 					{
-						a_Values[x + z * a_SizeX] = (rnd / 101) % bgLandOceanMax;
+						a_Values[x + z * a_SizeX] = (rnd / 1003) % bgLandOceanMax;
 					}
 				}
 			}
@@ -575,7 +581,7 @@ public:
 		// Define the per-biome-group biomes:
 		static const int oceanBiomes[] =
 		{
-			biOcean, // biDeepOcean,
+			biOcean,  // biDeepOcean,
 		};
 
 		// Same as oceanBiomes, there are no rare oceanic biomes (mushroom islands are handled separately)
@@ -680,6 +686,7 @@ protected:
 
 
 
+/** Randomly replaces pixels of one value to another value, using the given chance. */
 class cProtIntGenReplaceRandomly :
 	public cProtIntGenWithNoise
 {
@@ -725,9 +732,15 @@ public:
 
 
 protected:
+	/** The original value to be replaced. */
 	int m_From;
+
+	/** The destination value to which to replace. */
 	int m_To;
+
+	/** Chance, in permille, of replacing the value. */
 	int m_Chance;
+
 	Underlying m_Underlying;
 };
 
@@ -736,7 +749,9 @@ protected:
 
 
 /** Mixer that joins together finalized biomes and rivers.
-It first checks for oceans; if there's no ocean, it checks for a river. */
+It first checks for oceans, if there is an ocean in the Biomes, it keeps the ocean.
+If there's no ocean, it checks Rivers for a river, if there is a river, it uses the Biomes to select either
+regular river or frozen river, based on the biome. */
 class cProtIntGenMixRivers:
 	public cProtIntGen
 {
@@ -1043,8 +1058,8 @@ protected:
 
 
 
-/** Changes biomes in the parent data into their alternate verions ("M" variants), in such places that
-have their alterations set. */
+/** Changes biomes in the parent data into an alternate versions (usually "hill" variants), in such places
+that have their alterations set. */
 class cProtIntGenAlternateBiomes:
 	public cProtIntGenWithNoise
 {
@@ -1080,7 +1095,7 @@ public:
 			int val = a_Values[idx];
 			switch (val)
 			{
-				case biBirchForest:   val = biBirchForest;      break;
+				case biBirchForest:   val = biBirchForestHills; break;
 				case biDesert:        val = biDesertHills;      break;
 				case biExtremeHills:  val = biExtremeHillsPlus; break;
 				case biForest:        val = biForestHills;      break;
@@ -1267,6 +1282,8 @@ protected:
 
 
 
+/** Changes biomes in the parent data into their alternate versions ("M" variants), in such places that
+have their alterations set. */
 class cProtIntGenMBiomes:
 	public cProtIntGenWithNoise
 {
-- 
cgit v1.2.3


From dbed5c0726f69a2ff43a869491d93030d6d9c742 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 2 Nov 2014 16:47:56 +0100
Subject: Grown biomes: fixed Linux build.

---
 src/Generating/IntGen.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 83a0e569a..b25e378c0 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -1128,7 +1128,7 @@ public:
 	{
 		// Generate the base biomes and the alterations:
 		m_BaseBiomes->GetInts(a_MinX, a_MinZ, a_Values);
-		super::Values alterations;
+		typename super::Values alterations;
 		m_Alterations->GetInts(a_MinX, a_MinZ, alterations);
 
 		// Change the biomes into their alternate versions:
@@ -1196,7 +1196,7 @@ public:
 	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
 	{
 		// Generate the underlying biomes:
-		Underlying::element_type::Values lowerValues;
+		typename Underlying::element_type::Values lowerValues;
 		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerValues);
 
 		// Convert incompatible edges into neutral biomes:
@@ -1358,7 +1358,7 @@ public:
 	{
 		// Generate the underlying biomes and the alterations:
 		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
-		super::Values alterations;
+		typename super::Values alterations;
 		m_Alteration->GetInts(a_MinX, a_MinZ, alterations);
 
 		// Wherever alterations are nonzero, change into alternate biome, if available:
-- 
cgit v1.2.3


From ca296837386f428c50206ccdea4ba63ce014f8a3 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 3 Nov 2014 08:17:19 +0100
Subject: HeiGen: Moved construction to the end of file.

This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes.
---
 src/Generating/HeiGen.cpp | 150 +++++++++++++++++++++++-----------------------
 1 file changed, 75 insertions(+), 75 deletions(-)

(limited to 'src')

diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index f4e231470..f7a26544c 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -16,81 +16,6 @@
 
 
 
-////////////////////////////////////////////////////////////////////////////////
-// cTerrainHeightGen:
-
-cTerrainHeightGenPtr cTerrainHeightGen::CreateHeightGen(cIniFile & a_IniFile, cBiomeGenPtr a_BiomeGen, int a_Seed, bool & a_CacheOffByDefault)
-{
-	AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "");
-	if (HeightGenName.empty())
-	{
-		LOGWARN("[Generator] HeightGen value not set in world.ini, using \"Biomal\".");
-		HeightGenName = "Biomal";
-	}
-	
-	a_CacheOffByDefault = false;
-	cTerrainHeightGen * res = nullptr;
-	if (NoCaseCompare(HeightGenName, "flat") == 0)
-	{
-		res = new cHeiGenFlat;
-		a_CacheOffByDefault = true;  // We're generating faster than a cache would retrieve data
-	}
-	else if (NoCaseCompare(HeightGenName, "classic") == 0)
-	{
-		res = new cHeiGenClassic(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "DistortedHeightmap") == 0)
-	{
-		res = new cDistortedHeightmap(a_Seed, a_BiomeGen);
-	}
-	else if (NoCaseCompare(HeightGenName, "End") == 0)
-	{
-		res = new cEndGen(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "Mountains") == 0)
-	{
-		res = new cHeiGenMountains(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "Noise3D") == 0)
-	{
-		res = new cNoise3DComposable(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "biomal") == 0)
-	{
-		res = new cHeiGenBiomal(a_Seed, a_BiomeGen);
-
-		/*
-		// Performance-testing:
-		LOGINFO("Measuring performance of cHeiGenBiomal...");
-		clock_t BeginTick = clock();
-		for (int x = 0; x < 500; x++)
-		{
-			cChunkDef::HeightMap Heights;
-			res->GenHeightMap(x * 5, x * 5, Heights);
-		}
-		clock_t Duration = clock() - BeginTick;
-		LOGINFO("HeightGen for 500 chunks took %d ticks (%.02f sec)", Duration, (double)Duration / CLOCKS_PER_SEC);
-		//*/
-	}
-	else
-	{
-		// No match found, force-set the default and retry
-		LOGWARN("Unknown HeightGen \"%s\", using \"Biomal\" instead.", HeightGenName.c_str());
-		a_IniFile.DeleteValue("Generator", "HeightGen");
-		a_IniFile.SetValue("Generator", "HeightGen", "Biomal");
-		return CreateHeightGen(a_IniFile, a_BiomeGen, a_Seed, a_CacheOffByDefault);
-	}
-	
-	// Read the settings:
-	res->InitializeHeightGen(a_IniFile);
-	
-	return cTerrainHeightGenPtr(res);
-}
-
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // cHeiGenFlat:
 
@@ -611,3 +536,78 @@ NOISE_DATATYPE cHeiGenBiomal::GetHeightAt(int a_RelX, int a_RelZ, int a_ChunkX,
 
 
 
+////////////////////////////////////////////////////////////////////////////////
+// cTerrainHeightGen:
+
+cTerrainHeightGenPtr cTerrainHeightGen::CreateHeightGen(cIniFile & a_IniFile, cBiomeGenPtr a_BiomeGen, int a_Seed, bool & a_CacheOffByDefault)
+{
+	AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "");
+	if (HeightGenName.empty())
+	{
+		LOGWARN("[Generator] HeightGen value not set in world.ini, using \"Biomal\".");
+		HeightGenName = "Biomal";
+	}
+	
+	a_CacheOffByDefault = false;
+	cTerrainHeightGen * res = nullptr;
+	if (NoCaseCompare(HeightGenName, "flat") == 0)
+	{
+		res = new cHeiGenFlat;
+		a_CacheOffByDefault = true;  // We're generating faster than a cache would retrieve data
+	}
+	else if (NoCaseCompare(HeightGenName, "classic") == 0)
+	{
+		res = new cHeiGenClassic(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "DistortedHeightmap") == 0)
+	{
+		res = new cDistortedHeightmap(a_Seed, a_BiomeGen);
+	}
+	else if (NoCaseCompare(HeightGenName, "End") == 0)
+	{
+		res = new cEndGen(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "Mountains") == 0)
+	{
+		res = new cHeiGenMountains(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "Noise3D") == 0)
+	{
+		res = new cNoise3DComposable(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "biomal") == 0)
+	{
+		res = new cHeiGenBiomal(a_Seed, a_BiomeGen);
+
+		/*
+		// Performance-testing:
+		LOGINFO("Measuring performance of cHeiGenBiomal...");
+		clock_t BeginTick = clock();
+		for (int x = 0; x < 500; x++)
+		{
+			cChunkDef::HeightMap Heights;
+			res->GenHeightMap(x * 5, x * 5, Heights);
+		}
+		clock_t Duration = clock() - BeginTick;
+		LOGINFO("HeightGen for 500 chunks took %d ticks (%.02f sec)", Duration, (double)Duration / CLOCKS_PER_SEC);
+		//*/
+	}
+	else
+	{
+		// No match found, force-set the default and retry
+		LOGWARN("Unknown HeightGen \"%s\", using \"Biomal\" instead.", HeightGenName.c_str());
+		a_IniFile.DeleteValue("Generator", "HeightGen");
+		a_IniFile.SetValue("Generator", "HeightGen", "Biomal");
+		return CreateHeightGen(a_IniFile, a_BiomeGen, a_Seed, a_CacheOffByDefault);
+	}
+	
+	// Read the settings:
+	res->InitializeHeightGen(a_IniFile);
+	
+	return cTerrainHeightGenPtr(res);
+}
+
+
+
+
+
-- 
cgit v1.2.3


From f5c4a6a27d7c35afbbb57e0798d1473e2795ca22 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 3 Nov 2014 10:36:12 +0100
Subject: Added a (disabled) perf test for biome generators.

---
 src/Generating/BioGen.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 0f2b0a73d..5480d8d4c 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -5,6 +5,8 @@
 
 #include "Globals.h"
 #include "BioGen.h"
+#include <chrono>
+#include <iostream>
 #include "IntGen.h"
 #include "ProtIntGen.h"
 #include "../IniFile.h"
@@ -1199,3 +1201,47 @@ cBiomeGenPtr cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool &
 
 
 
+
+////////////////////////////////////////////////////////////////////////////////
+// Performance tests:
+
+// Change to 1 to enable the perf test:
+#if 0
+
+class cBioGenPerfTest
+{
+public:
+	cBioGenPerfTest()
+	{
+		std::cout << "BioGen performance tests commencing, please wait..." << std::endl;
+		TestGen("MultiStepMap", std::make_unique<cBioGenMultiStepMap>(1).get());
+		TestGen("Grown",        std::make_unique<cBioGenGrown>(1).get());
+		TestGen("GrownProt",    std::make_unique<cBioGenProtGrown>(1).get());
+		std::cout << "BioGen performance tests complete." << std::endl;
+	}
+
+protected:
+	void TestGen(const AString && a_GenName, cBiomeGen * a_BioGen)
+	{
+		// Initialize the default settings for the generator:
+		cIniFile iniFile;
+		a_BioGen->InitializeBiomeGen(iniFile);
+
+		// Generate the biomes:
+		auto start = std::chrono::system_clock::now();
+		for (int z = 0; z < 100; z++)
+		{
+			for (int x = 0; x < 100; x++)
+			{
+				cChunkDef::BiomeMap biomes;
+				a_BioGen->GenBiomes(x, z, biomes);
+			}  // for x
+		}  // for z
+		auto dur = std::chrono::system_clock::now() - start;
+		double milliseconds = static_cast<double>((std::chrono::duration_cast<std::chrono::milliseconds>(dur)).count());
+
+		std::cout << a_GenName << ": " << 1000.0 * 100.0 * 100.0 / milliseconds << " chunks per second" << std::endl;
+	}
+} g_BioGenPerfTest;
+
+#endif
\ No newline at end of file
-- 
cgit v1.2.3


From c5f3663bea6e24226217fe91402704a04f118831 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 3 Nov 2014 11:48:03 +0100
Subject: Fixed a missing endline.

---
 src/Generating/BioGen.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 5480d8d4c..2a4dbe794 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -1244,4 +1244,8 @@ protected:
 	}
 } g_BioGenPerfTest;
 
-#endif
\ No newline at end of file
+#endif
+
+
+
+
-- 
cgit v1.2.3


From f239a28d0661cbcfa7480d81008bb66607e55742 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 4 Nov 2014 08:40:23 +0100
Subject: Added MinMax height generator.

Fixes #1578.
---
 src/Generating/HeiGen.cpp | 207 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)

(limited to 'src')

diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index f7a26544c..de97bc1a0 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -536,6 +536,209 @@ NOISE_DATATYPE cHeiGenBiomal::GetHeightAt(int a_RelX, int a_RelZ, int a_ChunkX,
 
 
 
+////////////////////////////////////////////////////////////////////////////////
+// cHeiGenMinMax:
+
+class cHeiGenMinMax:
+	public cTerrainHeightGen
+{
+	typedef cTerrainHeightGen super;
+
+	/** Size of the averaging process, in columns (for each direction). Must be less than 16. */
+	static const int AVERAGING_SIZE = 4;
+
+public:
+	cHeiGenMinMax(int a_Seed, cBiomeGenPtr a_BiomeGen):
+		m_Noise(a_Seed),
+		m_BiomeGen(a_BiomeGen),
+		m_TotalWeight(0)
+	{
+		// Initialize the weights:
+		for (int z = 0; z <= AVERAGING_SIZE * 2; z++)
+		{
+			for (int x = 0; x <= AVERAGING_SIZE * 2; x++)
+			{
+				m_Weights[z][x] = 1 + 2 * AVERAGING_SIZE - std::abs(x - AVERAGING_SIZE) - std::abs(z - AVERAGING_SIZE);
+				m_TotalWeight += m_Weights[z][x];
+			}
+		}
+
+		// Initialize the Perlin generator:
+		m_Perlin.AddOctave(0.04f,   0.2f);
+		m_Perlin.AddOctave(0.02f,   0.1f);
+		m_Perlin.AddOctave(0.01f,   0.05f);
+		m_Perlin.AddOctave(0.005f,  0.025f);
+		m_Perlin.AddOctave(0.0025f, 0.0125f);
+	}
+
+
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap)
+	{
+		// Generate the biomes for the 3*3 neighbors:
+		cChunkDef::BiomeMap neighborBiomes[3][3];
+		for (int z = 0; z < 3; z++) for (int x = 0; x < 3; x++)
+		{
+			m_BiomeGen->GenBiomes(a_ChunkX + x - 1, a_ChunkZ + z - 1, neighborBiomes[z][x]);
+		}
+
+		// Get the min and max heights based on the biomes:
+		double minHeight[cChunkDef::Width * cChunkDef::Width];
+		double maxHeight[cChunkDef::Width * cChunkDef::Width];
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				// For each column, sum the min and max values of the neighborhood around it:
+				double min = 0, max = 0;
+				for (int relz = 0; relz <= AVERAGING_SIZE * 2; relz++)
+				{
+					int bz = z + 16 + relz - AVERAGING_SIZE;  // Biome Z coord relative to the neighborBiomes start
+					int cz = bz / 16;                         // Chunk Z coord relative to the neighborBiomes start
+					bz = bz % 16;                             // Biome Z coord relative to cz in neighborBiomes
+					for (int relx = 0; relx <= AVERAGING_SIZE * 2; relx++)
+					{
+						int bx = x + 16 + relx - AVERAGING_SIZE;  // Biome X coord relative to the neighborBiomes start
+						int cx = bx / 16;                         // Chunk X coord relative to the neighborBiomes start
+						bx = bx % 16;                             // Biome X coord relative to cz in neighborBiomes
+
+						// Get the biome's min and max heights:
+						double bmin, bmax;
+						getBiomeMinMax(cChunkDef::GetBiome(neighborBiomes[cz][cx], bx, bz), bmin, bmax);
+
+						// Add them to the total, with the weight depending on their relative position to the column:
+						min += bmin * m_Weights[relz][relx];
+						max += bmax * m_Weights[relz][relx];
+					}  // for relx
+				}  // for relz
+				minHeight[x + z * cChunkDef::Width] = min / m_TotalWeight;
+				maxHeight[x + z * cChunkDef::Width] = max / m_TotalWeight;
+			}  // for x
+		}  // for z
+
+		// Generate the base noise:
+		NOISE_DATATYPE noise[cChunkDef::Width * cChunkDef::Width];
+		NOISE_DATATYPE workspace[cChunkDef::Width * cChunkDef::Width];
+		NOISE_DATATYPE startX = static_cast<float>(a_ChunkX * cChunkDef::Width);
+		NOISE_DATATYPE endX = startX + cChunkDef::Width - 1;
+		NOISE_DATATYPE startZ = static_cast<float>(a_ChunkZ * cChunkDef::Width);
+		NOISE_DATATYPE endZ = startZ + cChunkDef::Width - 1;
+		m_Perlin.Generate2D(noise, 16, 16, startX, endX, startZ, endZ, workspace);
+
+		// Make the height by ranging the noise between min and max:
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				double min = minHeight[x + z * cChunkDef::Width];
+				double max = maxHeight[x + z * cChunkDef::Width];
+				double h = (max + min) / 2 + noise[x + z * cChunkDef::Width] * (max - min);
+				cChunkDef::SetHeight(a_HeightMap, x, z, static_cast<HEIGHTTYPE>(h));
+			}
+		}
+	}
+
+	
+	virtual void InitializeHeightGen(cIniFile & a_IniFile)
+	{
+		// No settings available
+	}
+
+protected:
+	cNoise m_Noise;
+
+	cPerlinNoise m_Perlin;
+
+	/** The biome generator to query for the underlying biomes. */
+	cBiomeGenPtr m_BiomeGen;
+
+	/** Weights applied to each of the min / max values in the neighborhood of the currently evaluated column. */
+	double m_Weights[AVERAGING_SIZE * 2 + 1][AVERAGING_SIZE * 2 + 1];
+
+	/** Sum of all the m_Weights items. */
+	double m_TotalWeight;
+
+
+	/** Returns the minimum and maximum heights for the given biome. */
+	void getBiomeMinMax(EMCSBiome a_Biome, double & a_Min, double & a_Max)
+	{
+		switch (a_Biome)
+		{
+			case biBeach:                a_Min = 61; a_Max = 64; break;
+			case biBirchForest:          a_Min = 63; a_Max = 75; break;
+			case biBirchForestHills:     a_Min = 63; a_Max = 90; break;
+			case biBirchForestHillsM:    a_Min = 63; a_Max = 90; break;
+			case biBirchForestM:         a_Min = 63; a_Max = 75; break;
+			case biColdBeach:            a_Min = 61; a_Max = 64; break;
+			case biColdTaiga:            a_Min = 63; a_Max = 75; break;
+			case biColdTaigaHills:       a_Min = 63; a_Max = 90; break;
+			case biColdTaigaM:           a_Min = 63; a_Max = 75; break;
+			case biDeepOcean:            a_Min = 30; a_Max = 60; break;
+			case biDesert:               a_Min = 63; a_Max = 70; break;
+			case biDesertHills:          a_Min = 63; a_Max = 85; break;
+			case biDesertM:              a_Min = 63; a_Max = 70; break;
+			case biEnd:                  a_Min = 10; a_Max = 100; break;
+			case biExtremeHills:         a_Min = 60; a_Max = 120; break;
+			case biExtremeHillsEdge:     a_Min = 63; a_Max = 100; break;
+			case biExtremeHillsM:        a_Min = 60; a_Max = 120; break;
+			case biExtremeHillsPlus:     a_Min = 60; a_Max = 140; break;
+			case biExtremeHillsPlusM:    a_Min = 60; a_Max = 140; break;
+			case biFlowerForest:         a_Min = 63; a_Max = 75; break;
+			case biForest:               a_Min = 63; a_Max = 75; break;
+			case biForestHills:          a_Min = 63; a_Max = 90; break;
+			case biFrozenOcean:          a_Min = 45; a_Max = 64; break;
+			case biFrozenRiver:          a_Min = 60; a_Max = 62; break;
+			case biIceMountains:         a_Min = 63; a_Max = 90; break;
+			case biIcePlains:            a_Min = 63; a_Max = 70; break;
+			case biIcePlainsSpikes:      a_Min = 60; a_Max = 70; break;
+			case biJungle:               a_Min = 60; a_Max = 80; break;
+			case biJungleEdge:           a_Min = 62; a_Max = 75; break;
+			case biJungleEdgeM:          a_Min = 62; a_Max = 75; break;
+			case biJungleHills:          a_Min = 60; a_Max = 90; break;
+			case biJungleM:              a_Min = 60; a_Max = 75; break;
+			case biMegaSpruceTaiga:      a_Min = 63; a_Max = 75; break;
+			case biMegaSpruceTaigaHills: a_Min = 63; a_Max = 90; break;
+			case biMegaTaiga:            a_Min = 63; a_Max = 75; break;
+			case biMegaTaigaHills:       a_Min = 63; a_Max = 90; break;
+			case biMesa:                 a_Min = 63; a_Max = 90; break;
+			case biMesaBryce:            a_Min = 60; a_Max = 67; break;
+			case biMesaPlateau:          a_Min = 75; a_Max = 85; break;
+			case biMesaPlateauF:         a_Min = 80; a_Max = 90; break;
+			case biMesaPlateauFM:        a_Min = 80; a_Max = 90; break;
+			case biMesaPlateauM:         a_Min = 75; a_Max = 85; break;
+			case biMushroomIsland:       a_Min = 63; a_Max = 90; break;
+			case biMushroomShore:        a_Min = 60; a_Max = 75; break;
+			case biNether:               a_Min = 10; a_Max = 100; break;
+			case biOcean:                a_Min = 45; a_Max = 64; break;
+			case biPlains:               a_Min = 63; a_Max = 70; break;
+			case biRiver:                a_Min = 60; a_Max = 62; break;
+			case biRoofedForest:         a_Min = 63; a_Max = 75; break;
+			case biRoofedForestM:        a_Min = 63; a_Max = 75; break;
+			case biSavanna:              a_Min = 63; a_Max = 75; break;
+			case biSavannaM:             a_Min = 63; a_Max = 80; break;
+			case biSavannaPlateau:       a_Min = 75; a_Max = 100; break;
+			case biSavannaPlateauM:      a_Min = 80; a_Max = 160; break;
+			case biStoneBeach:           a_Min = 60; a_Max = 64; break;
+			case biSunflowerPlains:      a_Min = 63; a_Max = 70; break;
+			case biSwampland:            a_Min = 60; a_Max = 67; break;
+			case biSwamplandM:           a_Min = 61; a_Max = 67; break;
+			case biTaiga:                a_Min = 63; a_Max = 75; break;
+			case biTaigaHills:           a_Min = 63; a_Max = 90; break;
+			case biTaigaM:               a_Min = 63; a_Max = 80; break;
+			default:
+			{
+				ASSERT(!"Unknown biome");
+				a_Min = 10;
+				a_Max = 10;
+				break;
+			}
+		}
+	}
+};
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // cTerrainHeightGen:
 
@@ -567,6 +770,10 @@ cTerrainHeightGenPtr cTerrainHeightGen::CreateHeightGen(cIniFile & a_IniFile, cB
 	{
 		res = new cEndGen(a_Seed);
 	}
+	else if (NoCaseCompare(HeightGenName, "MinMax") == 0)
+	{
+		res = new cHeiGenMinMax(a_Seed, a_BiomeGen);
+	}
 	else if (NoCaseCompare(HeightGenName, "Mountains") == 0)
 	{
 		res = new cHeiGenMountains(a_Seed);
-- 
cgit v1.2.3


From 7d2b2f90b6190d8fb5280ba0dd43671cd3012f20 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 4 Nov 2014 08:41:18 +0100
Subject: MinMax heigen: Reduced the number of octaves.

They didn't affect the terrain that much anyway.
---
 src/Generating/HeiGen.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index de97bc1a0..28a5698e4 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -567,8 +567,6 @@ public:
 		m_Perlin.AddOctave(0.04f,   0.2f);
 		m_Perlin.AddOctave(0.02f,   0.1f);
 		m_Perlin.AddOctave(0.01f,   0.05f);
-		m_Perlin.AddOctave(0.005f,  0.025f);
-		m_Perlin.AddOctave(0.0025f, 0.0125f);
 	}
 
 
-- 
cgit v1.2.3