1 files changed, 11 insertions, 16 deletions

diff --git a/src/Generating/EndGen.h b/src/Generating/EndGen.h
index c1c6f00b6..bd1debdeb 100644
--- a/src/Generating/EndGen.h
+++ b/src/Generating/EndGen.h
@@ -30,33 +30,28 @@ protected:
 
 	/** The Perlin noise used for generating */
 	cPerlinNoise m_Perlin;
+	cPerlinNoise m_VoidOffsetNoise;
 
-	// XYZ size of the "island", in blocks:
-	int m_IslandSizeX;
-	int m_IslandSizeY;
-	int m_IslandSizeZ;
+	NOISE_DATATYPE m_AirThresholdMainIsland;
+	NOISE_DATATYPE m_AirThresholdOtherIslands;
+	int m_MainIslandSize;
+	int m_BaseHeight;
+	int m_TerrainTopMultiplier;
+	int m_TerrainBottomMultiplier;
+	int m_VoidOffsetNoiseMultiplier;
 
 	// XYZ Frequencies of the noise functions:
 	NOISE_DATATYPE m_FrequencyX;
 	NOISE_DATATYPE m_FrequencyY;
 	NOISE_DATATYPE m_FrequencyZ;
 
-	// Noise array for the last chunk (in the noise range)
-	cChunkCoords m_LastChunkCoords;
-	NOISE_DATATYPE m_NoiseArray[17 * 17 * 257];  // x + 17 * z + 17 * 17 * y
-
-
-	/** Unless the LastChunk coords are equal to coords given, prepares the internal state (noise array) */
-	void PrepareState(cChunkCoords a_ChunkCoords);
-
-	/** Generates the m_NoiseArray array for the current chunk */
-	void GenerateNoiseArray(void);
-
 	// cTerrainShapeGen overrides:
 	virtual void GenShape(cChunkCoords a_ChunkCoords, cChunkDesc::Shape & a_Shape) override;
 
 
 	// cTerrainCompositionGen overrides:
 	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
+
+	// cTerrainShapeGen overrides:
+	virtual void InitializeShapeGen(cIniFile & a_IniFile) override;
 } ;