From e35ac1bfb9b63bf1e49dafdcce2033ff42d7c205 Mon Sep 17 00:00:00 2001 From: Lukas Pioch Date: Sat, 20 May 2017 08:16:28 +0200 Subject: Clang 5.0 fixes - Added override keyword - Removed inherited member variables --- src/Generating/BioGen.h | 2 +- src/Generating/Caves.cpp | 2 +- src/Generating/Caves.h | 2 -- src/Generating/ChunkGenerator.h | 2 +- src/Generating/CompoGen.h | 2 +- src/Generating/HeiGen.h | 2 +- src/Generating/MineShafts.cpp | 1 - src/Generating/MineShafts.h | 1 - src/Generating/Noise3DGenerator.h | 2 +- src/Generating/PrefabPiecePool.h | 2 +- src/Generating/Ravines.cpp | 1 - src/Generating/Ravines.h | 1 - src/Generating/RoughRavines.cpp | 1 - src/Generating/RoughRavines.h | 2 -- src/Generating/VillageGen.cpp | 4 ++-- src/Generating/VillageGen.h | 2 +- 16 files changed, 10 insertions(+), 19 deletions(-) (limited to 'src/Generating') diff --git a/src/Generating/BioGen.h b/src/Generating/BioGen.h index 576c6b83d..104916761 100644 --- a/src/Generating/BioGen.h +++ b/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: diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp index 6dd0eb4b6..7057cd349 100644 --- a/src/Generating/Caves.cpp +++ b/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; diff --git a/src/Generating/Caves.h b/src/Generating/Caves.h index af5e3b5eb..cf47d9a92 100644 --- a/src/Generating/Caves.h +++ b/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 diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h index 5c778fda4..41390083f 100644 --- a/src/Generating/ChunkGenerator.h +++ b/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); diff --git a/src/Generating/CompoGen.h b/src/Generating/CompoGen.h index b5108bac6..bc15a2dcb 100644 --- a/src/Generating/CompoGen.h +++ b/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; diff --git a/src/Generating/HeiGen.h b/src/Generating/HeiGen.h index 67c6c00cd..0f7b59093 100644 --- a/src/Generating/HeiGen.h +++ b/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; diff --git a/src/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp index a9f2d1568..755fa23a3 100644 --- a/src/Generating/MineShafts.cpp +++ b/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)), diff --git a/src/Generating/MineShafts.h b/src/Generating/MineShafts.h index 401b1d31e..83f60ec77 100644 --- a/src/Generating/MineShafts.h +++ b/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 diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h index 1bbae2584..0b0730e21 100644 --- a/src/Generating/Noise3DGenerator.h +++ b/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; diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h index ff0446b56..14df221c6 100644 --- a/src/Generating/PrefabPiecePool.h +++ b/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); diff --git a/src/Generating/Ravines.cpp b/src/Generating/Ravines.cpp index 40022aefb..1dd58a7b8 100644 --- a/src/Generating/Ravines.cpp +++ b/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) { } diff --git a/src/Generating/Ravines.h b/src/Generating/Ravines.h index 0bcdffa3b..5353978d0 100644 --- a/src/Generating/Ravines.h +++ b/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 diff --git a/src/Generating/RoughRavines.cpp b/src/Generating/RoughRavines.cpp index f6f984ab4..a9e9a97de 100644 --- a/src/Generating/RoughRavines.cpp +++ b/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), diff --git a/src/Generating/RoughRavines.h b/src/Generating/RoughRavines.h index a5ce13357..b326d7345 100644 --- a/src/Generating/RoughRavines.h +++ b/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; diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp index 11617c9ec..1b6f012db 100644 --- a/src/Generating/VillageGen.cpp +++ b/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(rnd) % availablePools.size()]; rnd /= 137; diff --git a/src/Generating/VillageGen.h b/src/Generating/VillageGen.h index df68d407d..a7fc1b255 100644 --- a/src/Generating/VillageGen.h +++ b/src/Generating/VillageGen.h @@ -47,7 +47,7 @@ protected: typedef std::vector > cVillagePiecePools; /** The noise used for generating random numbers */ - cNoise m_Noise; + cNoise m_RandNoise; /** Maximum depth of the generator tree */ int m_MaxDepth; -- cgit v1.2.3