Clang 5.0 fixes

- Added override keyword
- Removed inherited member variables

src/AllocationPool.h

@@ -64,7 +64,7 @@ class cListAllocationPool:
 	}
 
 
-	virtual ~cListAllocationPool()
+	virtual ~cListAllocationPool() override
 	{
 		while (!m_FreeList.empty())
 		{

src/Bindings/LuaChunkStay.h

@@ -32,7 +32,7 @@ class cLuaChunkStay
 public:
 	cLuaChunkStay();
 
-	~cLuaChunkStay() { }
+	virtual ~cLuaChunkStay() override { }
 
 	/** Adds chunks in the specified Lua table.
 	Can be called only once.

src/Bindings/LuaServerHandle.h

@@ -34,7 +34,7 @@ class cLuaServerHandle:
 	wrapping the (listen-) callbacks that are in the specified table. */
 	cLuaServerHandle(UInt16 a_Port, cLuaState::cTableRefPtr && a_Callbacks);
 
-	~cLuaServerHandle();
+	virtual ~cLuaServerHandle() override;
 
 	/** Called by cNetwork::Listen()'s binding.
 	Sets the server handle around which this instance is wrapped, and a self SharedPtr for link management. */

src/Bindings/LuaTCPLink.h

@@ -35,7 +35,7 @@ class cLuaTCPLink:
 	/** Creates a new instance of the link, attached to the specified plugin and wrapping the callbacks that are in the specified referenced table. */
 	cLuaTCPLink(cLuaState::cTableRefPtr && a_Callbacks, cLuaServerHandleWPtr a_Server);
 
-	~cLuaTCPLink();
+	virtual ~cLuaTCPLink() override;
 
 	/** Sends the data contained in the string to the remote peer.
 	Returns true if successful, false on immediate failure (queueing the data failed or link not available). */

src/Bindings/LuaUDPEndpoint.h

@@ -31,7 +31,7 @@ class cLuaUDPEndpoint:
 	/** Creates a new instance of the endpoint, wrapping the callbacks that are in the specified table. */
 	cLuaUDPEndpoint(cLuaState::cTableRefPtr && a_Callbacks);
 
-	~cLuaUDPEndpoint();
+	virtual ~cLuaUDPEndpoint() override;
 
 	/** Opens the endpoint so that it starts listening for incoming data on the specified port.
 	a_Self is the shared pointer to self that the object keeps to keep itself alive for as long as it needs (for Lua). */

src/Bindings/LuaWindow.h

@@ -42,7 +42,7 @@ class cLuaWindow :
 	cLuaWindow(cLuaState & a_LuaState, cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title);
 
 	// tolua_begin
-	virtual ~cLuaWindow();
+	virtual ~cLuaWindow() override;
 
 	/** Returns the internal representation of the contents that are manipulated by Lua */
 	cItemGrid & GetContents(void) { return m_Contents; }

src/Bindings/PluginLua.h

@@ -63,7 +63,7 @@ class cPluginLua :
 
 
 	cPluginLua(const AString & a_PluginDirectory, cDeadlockDetect & a_DeadlockDetect);
-	~cPluginLua();
+	virtual ~cPluginLua() override;
 
 	virtual void OnDisable(void) override;
 	virtual bool Load(void) override;

src/BlockEntities/BrewingstandEntity.h

@@ -40,7 +40,7 @@ class cBrewingstandEntity :
 	/** Constructor used for normal operation */
 	cBrewingstandEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
 
-	virtual ~cBrewingstandEntity();
+	virtual ~cBrewingstandEntity() override;
 
 	//  cBlockEntity overrides:
 	virtual void SendTo(cClientHandle & a_Client) override;

src/BlockEntities/ChestEntity.h

@@ -33,7 +33,7 @@ class cChestEntity :
 	/** Constructor used for normal operation */
 	cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World, BLOCKTYPE a_Type);
 
-	virtual ~cChestEntity();
+	virtual ~cChestEntity() override;
 
 	// cBlockEntity overrides:
 	virtual void SendTo(cClientHandle & a_Client) override;

src/BlockEntities/DropSpenserEntity.h

@@ -40,7 +40,7 @@ class cDropSpenserEntity :
 	BLOCKENTITY_PROTODEF(cDropSpenserEntity)
 
 	cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
-	virtual ~cDropSpenserEntity();
+	virtual ~cDropSpenserEntity() override;
 
 	// cBlockEntity overrides:
 	virtual bool Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;

src/BlockEntities/EnderChestEntity.h

@@ -21,7 +21,7 @@ class cEnderChestEntity :
 	BLOCKENTITY_PROTODEF(cEnderChestEntity)
 
 	cEnderChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
-	virtual ~cEnderChestEntity();
+	virtual ~cEnderChestEntity() override;
 
 	// cBlockEntity overrides:
 	virtual bool UsedBy(cPlayer * a_Player) override;

src/BlockEntities/FurnaceEntity.h

@@ -38,7 +38,7 @@ class cFurnaceEntity :
 	/** Constructor used for normal operation */
 	cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
 
-	virtual ~cFurnaceEntity();
+	virtual ~cFurnaceEntity() override;
 
 	// cBlockEntity overrides:
 	virtual void SendTo(cClientHandle & a_Client) override;

src/BlockEntities/JukeboxEntity.h

@@ -20,7 +20,7 @@ class cJukeboxEntity :
 	BLOCKENTITY_PROTODEF(cJukeboxEntity)
 
 	cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
-	virtual ~cJukeboxEntity();
+	virtual ~cJukeboxEntity() override;
 
 	// tolua_begin
 

src/BlockEntities/NoteEntity.h

@@ -34,7 +34,7 @@ class cNoteEntity :
 
 	/** Creates a new note entity. a_World may be nullptr */
 	cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
-	virtual ~cNoteEntity() {}
+	virtual ~cNoteEntity() override {}
 
 	// tolua_begin
 

src/Blocks/ClearMetaOnDrop.h

@@ -16,7 +16,7 @@ class cClearMetaOnDrop : public Base
 		Base(a_BlockType)
 	{}
 
-	virtual ~cClearMetaOnDrop() {}
+	virtual ~cClearMetaOnDrop() override {}
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(this->m_BlockType));

src/Blocks/MetaRotator.h

@@ -29,7 +29,7 @@ class cMetaRotator : public Base
 		Base(a_BlockType)
 	{}
 
-	virtual ~cMetaRotator() {}
+	virtual ~cMetaRotator() override {}
 
 	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta)  override;
 	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta)  override;

src/ChunkSender.h

@@ -57,7 +57,7 @@ class cChunkSender:
 	typedef cIsThread super;
 public:
 	cChunkSender(cWorld & a_World);
-	~cChunkSender();
+	virtual ~cChunkSender() override;
 
 	enum eChunkPriority
 	{

src/ClientHandle.h

@@ -71,7 +71,7 @@ class cClientHandle  // tolua_export
 	/** Creates a new client with the specified IP address in its description and the specified initial view distance. */
 	cClientHandle(const AString & a_IPString, int a_ViewDistance);
 
-	virtual ~cClientHandle();
+	virtual ~cClientHandle() override;
 
 	const AString & GetIPString(void) const { return m_IPString; }  // tolua_export
 

src/DeadlockDetect.h

@@ -27,7 +27,7 @@ class cDeadlockDetect :
 
 public:
 	cDeadlockDetect(void);
-	~cDeadlockDetect();
+	virtual ~cDeadlockDetect() override;
 
 	/** Starts the detection. Hides cIsThread's Start, because we need some initialization */
 	bool Start(int a_IntervalSec);

src/Entities/Pawn.h

@@ -22,7 +22,7 @@ class cPawn :
 	CLASS_PROTODEF(cPawn)
 
 	cPawn(eEntityType a_EntityType, double a_Width, double a_Height);
-	~cPawn();
+	virtual ~cPawn() override;
 	virtual void Destroyed() override;
 
 	virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;

src/Entities/Player.cpp

@@ -74,8 +74,6 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
 	m_IsCrouched(false),
 	m_IsSprinting(false),
 	m_IsFlying(false),
-	m_IsSwimming(false),
-	m_IsSubmerged(false),
 	m_IsFishing(false),
 	m_CanFly(false),
 	m_EatingFinishTick(-1),
@@ -96,6 +94,9 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
 {
 	ASSERT(a_PlayerName.length() <= 16);  // Otherwise this player could crash many clients...
 
+	m_IsSwimming = false;
+	m_IsSubmerged = false;
+
 	m_InventoryWindow = new cInventoryWindow(*this);
 	m_CurrentWindow = m_InventoryWindow;
 	m_InventoryWindow->OpenedByPlayer(*this);

src/Entities/Player.h

@@ -43,7 +43,7 @@ class cPlayer :
 
 	virtual bool Initialize(cWorld & a_World) override;
 
-	virtual ~cPlayer();
+	virtual ~cPlayer() override;
 
 	virtual void SpawnOn(cClientHandle & a_Client) override;
 
@@ -645,8 +645,6 @@ class cPlayer :
 	bool m_IsCrouched;
 	bool m_IsSprinting;
 	bool m_IsFlying;
-	bool m_IsSwimming;
-	bool m_IsSubmerged;
 	bool m_IsFishing;
 
 	bool m_CanFly;  // If this is true the player can fly. Even if he is not in creative.

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 @@ class cStructGenWormNestCaves::cCaveSystem :
 	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 @@ class cStructGenWormNestCaves :
 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 @@ class cChunkGenerator :
 
 
 	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 @@ class cStructGenMineShafts :
 	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 @@ class cPrefabPiecePool :
 	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 @@ class cStructGenRavines::cRavine :
 
 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 @@ class cStructGenRavines :
 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 @@ class cRoughRavines :
 	);
 
 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 @@ class cVillageGen :
 	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;

src/HTTP/HTTPServerConnection.h

@@ -33,7 +33,7 @@ class cHTTPServerConnection :
 	cHTTPServerConnection(cHTTPServer & a_HTTPServer);
 
 	// Force a virtual destructor in all descendants
-	virtual ~cHTTPServerConnection();
+	virtual ~cHTTPServerConnection() override;
 
 	/** Sends HTTP status code together with a_Reason (used for HTTP errors).
 	Sends the a_Reason as the body as well, so that browsers display it.

src/HTTP/SslHTTPServerConnection.h

@@ -26,7 +26,7 @@ class cSslHTTPServerConnection :
 	Sends the specified cert as the server certificate, uses the private key for decryption. */
 	cSslHTTPServerConnection(cHTTPServer & a_HTTPServer, const cX509CertPtr & a_Cert, const cCryptoKeyPtr & a_PrivateKey);
 
-	~cSslHTTPServerConnection();
+	virtual ~cSslHTTPServerConnection() override;
 
 protected:
 	cBufferedSslContext m_Ssl;

src/IniFile.h

@@ -71,7 +71,7 @@ class cIniFile : public cSettingsRepositoryInterface
 	cIniFile(void);
 
 	// tolua_end
-	virtual ~cIniFile() = default;
+	virtual ~cIniFile() override = default;
 
 	virtual std::vector<std::pair<AString, AString>> GetValues(AString a_keyName) override;