Clang 5.0 fixes

- Added override keyword
- Removed inherited member variables

src/Generating/BioGen.h

@@ -49,7 +49,7 @@ class cBioGenCache :
 
 public:
 	cBioGenCache(cBiomeGenPtr a_BioGenToCache, size_t a_CacheSize);
-	virtual ~cBioGenCache();
+	virtual ~cBioGenCache() override;
 
 protected:
 

src/Generating/Caves.cpp

@@ -127,7 +127,7 @@ public:
 	int m_BlockZ;
 
 	cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise);
-	~cCaveSystem();
+	virtual ~cCaveSystem() override;
 
 protected:
 	int m_Size;

src/Generating/Caves.h

@@ -69,7 +69,6 @@ class cStructGenWormNestCaves :
 public:
 	cStructGenWormNestCaves(int a_Seed, int a_Size = 64, int a_Grid = 96, int a_MaxOffset = 128) :
 		super(a_Seed, a_Grid, a_Grid, a_MaxOffset, a_MaxOffset, a_Size, a_Size, 100),
-		m_Noise(a_Seed),
 		m_Size(a_Size),
 		m_MaxOffset(a_MaxOffset),
 		m_Grid(a_Grid)
@@ -79,7 +78,6 @@ public:
 protected:
 	class cCaveSystem;  // fwd: Caves.cpp
 
-	cNoise       m_Noise;
 	int          m_Size;  // relative size of the cave systems' caves. Average number of blocks of each initial tunnel
 	int          m_MaxOffset;  // maximum offset of the cave nest origin from the grid cell the nest belongs to
 	int          m_Grid;  // average spacing of the nests

src/Generating/ChunkGenerator.h

@@ -109,7 +109,7 @@ public:
 
 
 	cChunkGenerator (void);
-	~cChunkGenerator();
+	virtual ~cChunkGenerator() override;
 
 	bool Start(cPluginInterface & a_PluginInterface, cChunkSink & a_ChunkSink, cIniFile & a_IniFile);
 	void Stop(void);

src/Generating/CompoGen.h

@@ -116,7 +116,7 @@ class cCompoGenCache :
 {
 public:
 	cCompoGenCache(cTerrainCompositionGenPtr a_Underlying, int a_CacheSize);  // Doesn't take ownership of a_Underlying
-	~cCompoGenCache();
+	virtual ~cCompoGenCache() override;
 
 	// cTerrainCompositionGen override:
 	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override;

src/Generating/HeiGen.h

@@ -29,7 +29,7 @@ class cHeiGenCache :
 {
 public:
 	cHeiGenCache(cTerrainHeightGenPtr a_HeiGenToCache, size_t a_CacheSize);
-	~cHeiGenCache();
+	virtual ~cHeiGenCache() override;
 
 	// cTerrainHeightGen overrides:
 	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;

src/Generating/MineShafts.cpp

@@ -1293,7 +1293,6 @@ cStructGenMineShafts::cStructGenMineShafts(
 	int a_ChanceCorridor, int a_ChanceCrossing, int a_ChanceStaircase
 ) :
 	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSystemSize, a_MaxSystemSize, 100),
-	m_Noise(a_Seed),
 	m_GridSize(a_GridSize),
 	m_MaxSystemSize(a_MaxSystemSize),
 	m_ProbLevelCorridor(std::max(0, a_ChanceCorridor)),

src/Generating/MineShafts.h

@@ -34,7 +34,6 @@ protected:
 	friend class cMineShaftStaircase;
 	class cMineShaftSystem;  // fwd: MineShafts.cpp
 
-	cNoise m_Noise;
 	int    m_GridSize;            ///< Average spacing of the systems
 	int    m_MaxSystemSize;       ///< Maximum blcok size of a mineshaft system
 	int    m_ProbLevelCorridor;   ///< Probability level of a branch object being the corridor

src/Generating/Noise3DGenerator.h

@@ -27,7 +27,7 @@ class cNoise3DGenerator :
 
 public:
 	cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator);
-	virtual ~cNoise3DGenerator();
+	virtual ~cNoise3DGenerator() override;
 
 	virtual void Initialize(cIniFile & a_IniFile) override;
 	virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;

src/Generating/PrefabPiecePool.h

@@ -50,7 +50,7 @@ public:
 	cPrefabPiecePool(const AString & a_FileName, bool a_LogWarnings);
 
 	/** Destroys the pool, freeing all pieces. */
-	~cPrefabPiecePool();
+	virtual ~cPrefabPiecePool() override;
 
 	/** Removes and frees all pieces from this pool. */
 	void Clear(void);

src/Generating/Ravines.cpp

@@ -82,7 +82,6 @@ protected:
 
 cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) :
 	super(a_Seed, a_Size, a_Size, a_Size, a_Size, a_Size * 2, a_Size * 2, 100),
-	m_Noise(a_Seed),
 	m_Size(a_Size)
 {
 }

src/Generating/Ravines.h

@@ -26,7 +26,6 @@ public:
 protected:
 	class cRavine;  // fwd: Ravines.cpp
 
-	cNoise m_Noise;
 	int    m_Size;  // Max size, in blocks, of the ravines generated
 
 

src/Generating/RoughRavines.cpp

@@ -231,7 +231,6 @@ cRoughRavines::cRoughRavines(
 	int a_GridSize, int a_MaxOffset
 ) :
 	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 64),
-	m_Seed(a_Seed),
 	m_MaxSize(a_MaxSize),
 	m_MinSize(a_MinSize),
 	m_MaxCenterWidth(a_MaxCenterWidth),

src/Generating/RoughRavines.h

@@ -33,8 +33,6 @@ public:
 	);
 
 protected:
-	int m_Seed;
-
 	/** Maximum size of the ravine, in each of the X / Z axis */
 	int m_MaxSize;
 

src/Generating/VillageGen.cpp

@@ -336,7 +336,7 @@ cVillageGen::cVillageGen(
 	const AStringVector & a_PrefabsToLoad
 ) :
 	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 100),
-	m_Noise(a_Seed + 1000),
+	m_RandNoise(a_Seed + 1000),
 	m_MaxDepth(a_MaxDepth),
 	m_MaxSize(a_MaxSize),
 	m_MinDensity(a_MinDensity),
@@ -399,7 +399,7 @@ cGridStructGen::cStructurePtr cVillageGen::CreateStructure(int a_GridX, int a_Gr
 	{
 		return cStructurePtr();
 	}
-	auto rnd = m_Noise.IntNoise2DInt(a_OriginX, a_OriginZ) / 11;
+	auto rnd = m_RandNoise.IntNoise2DInt(a_OriginX, a_OriginZ) / 11;
 	auto pool = availablePools[static_cast<size_t>(rnd) % availablePools.size()];
 	rnd /= 137;
 

src/Generating/VillageGen.h

@@ -47,7 +47,7 @@ protected:
 	typedef std::vector<SharedPtr<cVillagePiecePool> > cVillagePiecePools;
 
 	/** The noise used for generating random numbers */
-	cNoise m_Noise;
+	cNoise m_RandNoise;
 
 	/** Maximum depth of the generator tree */
 	int m_MaxDepth;