342 files changed, 1550 insertions, 1545 deletions

diff --git a/src/AllocationPool.h b/src/AllocationPool.h
index 060cd2918..61431a548 100644
--- a/src/AllocationPool.h
+++ b/src/AllocationPool.h
@@ -63,7 +63,7 @@ class cListAllocationPool : public cAllocationPool<T>
 			}
 		}
 		
-		virtual T * Allocate() /*override*/
+		virtual T * Allocate() override
 		{
 			if (m_FreeList.size() <= NumElementsInReserve)
 			{
@@ -88,7 +88,7 @@ class cListAllocationPool : public cAllocationPool<T>
 			m_FreeList.pop_front();
 			return ret;
 		}
-		virtual void Free(T * a_ptr) /*override*/
+		virtual void Free(T * a_ptr) override
 		{
 			if (a_ptr == NULL)
 			{
diff --git a/src/Bindings/AllToLua.sh b/src/Bindings/AllToLua.sh
index 887c2490c..887c2490c 100755..100644
--- a/src/Bindings/AllToLua.sh
+++ b/src/Bindings/AllToLua.sh
diff --git a/src/Bindings/LuaChunkStay.h b/src/Bindings/LuaChunkStay.h
index 13a9e3e58..49ab9a0ad 100644
--- a/src/Bindings/LuaChunkStay.h
+++ b/src/Bindings/LuaChunkStay.h
@@ -54,10 +54,10 @@ protected:
 	cLuaState::cRef m_OnAllChunksAvailable;
 	
 	
-	// cChunkStay /*override*/s:
-	virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual bool OnAllChunksAvailable(void) /*override*/;
-	virtual void OnDisabled(void) /*override*/;
+	// cChunkStay overrides:
+	virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) override;
+	virtual bool OnAllChunksAvailable(void) override;
+	virtual void OnDisabled(void) override;
 	
 	/** Adds a single chunk coord from the table at the top of the Lua stack.
 	Expects the top element to be a table, checks that it contains two numbers.
diff --git a/src/Bindings/LuaWindow.h b/src/Bindings/LuaWindow.h
index 26ce9d0da..dab99a2e2 100644
--- a/src/Bindings/LuaWindow.h
+++ b/src/Bindings/LuaWindow.h
@@ -81,12 +81,12 @@ protected:
 	/// The Lua reference for the callback to call when a slot has changed
 	int m_OnSlotChangedFnRef;
 	
-	// cWindow /*override*/s:
-	virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) /*override*/;
-	virtual void Destroy(void) /*override*/;
+	// cWindow overrides:
+	virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) override;
+	virtual void Destroy(void) override;
 	
-	// cItemGrid::cListener /*override*/s:
-	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+	// cItemGrid::cListener overrides:
+	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
 } ;  // tolua_export
 
 
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 603098bc6..b7ea65759 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -354,7 +354,7 @@ static int tolua_DoWith(lua_State* tolua_S)
 		{}
 
 	private:
-		virtual bool Item(Ty2 * a_Item) /*override*/
+		virtual bool Item(Ty2 * a_Item) override
 		{
 			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
@@ -444,7 +444,7 @@ static int tolua_DoWithID(lua_State* tolua_S)
 		{}
 
 	private:
-		virtual bool Item(Ty2 * a_Item) /*override*/
+		virtual bool Item(Ty2 * a_Item) override
 		{
 			lua_rawgeti(LuaState, LUA_REGISTRYINDEX, FuncRef);            // Push function to call
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());  // Push the item
@@ -540,7 +540,7 @@ static int tolua_DoWithXYZ(lua_State* tolua_S)
 		{}
 
 	private:
-		virtual bool Item(Ty2 * a_Item) /*override*/
+		virtual bool Item(Ty2 * a_Item) override
 		{
 			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
@@ -635,7 +635,7 @@ static int tolua_ForEachInChunk(lua_State * tolua_S)
 		{}
 
 	private:
-		virtual bool Item(Ty2 * a_Item) /*override*/
+		virtual bool Item(Ty2 * a_Item) override
 		{
 			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
@@ -797,7 +797,7 @@ static int tolua_ForEach(lua_State * tolua_S)
 		{}
 
 	private:
-		virtual bool Item(Ty2 * a_Item) /*override*/
+		virtual bool Item(Ty2 * a_Item) override
 		{
 			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype( LuaState, a_Item, Ty2::GetClassStatic());
@@ -1116,8 +1116,8 @@ protected:
 	cPluginLua & m_Plugin;
 	int m_FnRef;
 	
-	// cWorld::cTask /*override*/s:
-	virtual void Run(cWorld & a_World) /*override*/
+	// cWorld::cTask overrides:
+	virtual void Run(cWorld & a_World) override
 	{
 		m_Plugin.Call(m_FnRef, &a_World);
 	}
@@ -1180,8 +1180,8 @@ protected:
 	cPluginLua & m_Plugin;
 	int m_FnRef;
 	
-	// cWorld::cTask /*override*/s:
-	virtual void Run(cWorld & a_World) /*override*/
+	// cWorld::cTask overrides:
+	virtual void Run(cWorld & a_World) override
 	{
 		m_Plugin.Call(m_FnRef, &a_World);
 	}
@@ -1492,7 +1492,7 @@ static int tolua_cPluginManager_ForEachCommand(lua_State * tolua_S)
 		{}
 
 	private:
-		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) /*override*/
+		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) override
 		{
 			UNUSED(a_Plugin);
 			
@@ -1569,7 +1569,7 @@ static int tolua_cPluginManager_ForEachConsoleCommand(lua_State * tolua_S)
 		{}
 
 	private:
-		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) /*override*/
+		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) override
 		{
 			UNUSED(a_Plugin);
 			UNUSED(a_Permission);
@@ -1801,7 +1801,7 @@ static int tolua_cPluginManager_CallPlugin(lua_State * tolua_S)
 		const AString & m_FunctionName;
 		cLuaState & m_SrcLuaState;
 		
-		virtual bool Item(cPlugin * a_Plugin) /*override*/
+		virtual bool Item(cPlugin * a_Plugin) override
 		{
 			m_NumReturns = ((cPluginLua *)a_Plugin)->CallFunctionFromForeignState(
 				m_FunctionName, m_SrcLuaState, 4, lua_gettop(m_SrcLuaState)
@@ -2586,7 +2586,7 @@ public:
 	{
 	}
 	
-	virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/
+	virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
 	{
 		bool res = false;
 		if (!m_LuaState.Call(
@@ -2601,7 +2601,7 @@ public:
 		return res;
 	}
 	
-	virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ, char a_EntryFace) /*override*/
+	virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ, char a_EntryFace) override
 	{
 		bool res = false;
 		if (!m_LuaState.Call(
@@ -2616,7 +2616,7 @@ public:
 		return res;
 	}
 	
-	virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) /*override*/
+	virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) override
 	{
 		bool res = false;
 		if (!m_LuaState.Call(
@@ -2631,7 +2631,7 @@ public:
 		return res;
 	}
 	
-	virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) /*override*/
+	virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) override
 	{
 		bool res = false;
 		if (!m_LuaState.Call(
@@ -2646,12 +2646,12 @@ public:
 		return res;
 	}
 	
-	virtual void OnNoMoreHits(void) /*override*/
+	virtual void OnNoMoreHits(void) override
 	{
 		m_LuaState.Call(cLuaState::cTableRef(m_TableRef, "OnNoMoreHits"));
 	}
 	
-	virtual void OnNoChunk(void) /*override*/
+	virtual void OnNoChunk(void) override
 	{
 		m_LuaState.Call(cLuaState::cTableRef(m_TableRef, "OnNoChunk"));
 	}
diff --git a/src/Bindings/PluginLua.h b/src/Bindings/PluginLua.h
index 3bd55823d..ad855f6d8 100644
--- a/src/Bindings/PluginLua.h
+++ b/src/Bindings/PluginLua.h
@@ -64,92 +64,93 @@ public:
 	cPluginLua(const AString & a_PluginDirectory);
 	~cPluginLua();
 
-	virtual void OnDisable(void) /*override*/;
-	virtual bool Initialize(void) /*override*/;
-
-	virtual void Tick(float a_Dt) /*override*/;
-
-	virtual bool OnBlockSpread              (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, eSpreadSource a_Source) /*override*/;
-	virtual bool OnBlockToPickups           (cWorld * a_World, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cItems & a_Pickups) /*override*/;
-	virtual bool OnChat                     (cPlayer * a_Player, AString & a_Message) /*override*/;
-	virtual bool OnChunkAvailable           (cWorld * a_World, int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual bool OnChunkGenerated           (cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc) /*override*/;
-	virtual bool OnChunkGenerating          (cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc) /*override*/;
-	virtual bool OnChunkUnloaded            (cWorld * a_World, int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual bool OnChunkUnloading           (cWorld * a_World, int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual bool OnCollectingPickup         (cPlayer * a_Player, cPickup * a_Pickup) /*override*/;
-	virtual bool OnCraftingNoRecipe         (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) /*override*/;
-
-	virtual bool OnDisconnect               (cClientHandle & a_Client, const AString & a_Reason) /*override*/;
-	virtual bool OnEntityAddEffect          (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier) /*override*/;
-	virtual bool OnExecuteCommand           (cPlayer * a_Player, const AStringVector & a_Split) /*override*/;
-	virtual bool OnExploded                 (cWorld & a_World, double a_ExplosionSize,   bool a_CanCauseFire,   double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) /*override*/;
-	virtual bool OnExploding                (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) /*override*/;
-	virtual bool OnHandshake                (cClientHandle * a_Client, const AString & a_Username) /*override*/;
-	virtual bool OnHopperPullingItem        (cWorld & a_World, cHopperEntity & a_Hopper, int a_DstSlotNum, cBlockEntityWithItems & a_SrcEntity, int a_SrcSlotNum) /*override*/;
-	virtual bool OnHopperPushingItem        (cWorld & a_World, cHopperEntity & a_Hopper, int a_SrcSlotNum, cBlockEntityWithItems & a_DstEntity, int a_DstSlotNum) /*override*/;
-	virtual bool OnKilling                  (cEntity & a_Victim, cEntity * a_Killer, TakeDamageInfo & a_TDI) /*override*/;
-	virtual bool OnLogin                    (cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username) /*override*/;
-
-	virtual bool OnPlayerAnimation          (cPlayer & a_Player, int a_Animation) /*override*/;
-	virtual bool OnPlayerBreakingBlock      (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual bool OnPlayerBrokenBlock        (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual bool OnPlayerDestroyed          (cPlayer & a_Player) /*override*/;
-	virtual bool OnPlayerEating             (cPlayer & a_Player) /*override*/;
-	virtual bool OnPlayerFished             (cPlayer & a_Player, const cItems & a_Reward) /*override*/;
-	virtual bool OnPlayerFishing            (cPlayer & a_Player, cItems & a_Reward) /*override*/;
-	virtual bool OnPlayerFoodLevelChange    (cPlayer & a_Player, int a_NewFoodLevel) /*override*/;
-	virtual bool OnPlayerJoined             (cPlayer & a_Player) /*override*/;
-	virtual bool OnPlayerLeftClick          (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, char a_Status) /*override*/;
-	virtual bool OnPlayerMoving             (cPlayer & a_Player, const Vector3d & a_OldPosition, const Vector3d & a_NewPosition) /*override*/;
-	virtual bool OnPlayerPlacedBlock        (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual bool OnPlayerPlacingBlock       (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual bool OnPlayerRightClick         (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/;
-	virtual bool OnPlayerRightClickingEntity(cPlayer & a_Player, cEntity & a_Entity) /*override*/;
-	virtual bool OnPlayerShooting           (cPlayer & a_Player) /*override*/;
-	virtual bool OnPlayerSpawned            (cPlayer & a_Player) /*override*/;
-	virtual bool OnPlayerTossingItem        (cPlayer & a_Player) /*override*/;
-	virtual bool OnPlayerUsedBlock          (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual bool OnPlayerUsedItem           (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/;
-	virtual bool OnPlayerUsingBlock         (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual bool OnPlayerUsingItem          (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/;
-
-	virtual bool OnPluginMessage            (cClientHandle & a_Client, const AString & a_Channel, const AString & a_Message) /*override*/;
-	virtual bool OnPluginsLoaded            (void) /*override*/;
-	virtual bool OnPostCrafting             (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) /*override*/;
-	virtual bool OnPreCrafting              (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) /*override*/;
-	virtual bool OnProjectileHitBlock       (cProjectileEntity & a_Projectile, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Face, const Vector3d & a_BlockHitPos) /*override*/;
-	virtual bool OnProjectileHitEntity      (cProjectileEntity & a_Projectile, cEntity & a_HitEntity) /*override*/;
+	virtual void OnDisable(void) override;
+	virtual bool Initialize(void) override;
+
+	virtual void Tick(float a_Dt) override;
+
+	virtual bool OnBlockSpread              (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, eSpreadSource a_Source) override;
+	virtual bool OnBlockToPickups           (cWorld * a_World, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cItems & a_Pickups) override;
+	virtual bool OnChat                     (cPlayer * a_Player, AString & a_Message) override;
+	virtual bool OnChunkAvailable           (cWorld * a_World, int a_ChunkX, int a_ChunkZ) override;
+	virtual bool OnChunkGenerated           (cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc) override;
+	virtual bool OnChunkGenerating          (cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc) override;
+	virtual bool OnChunkUnloaded            (cWorld * a_World, int a_ChunkX, int a_ChunkZ) override;
+	virtual bool OnChunkUnloading           (cWorld * a_World, int a_ChunkX, int a_ChunkZ) override;
+	virtual bool OnCollectingPickup         (cPlayer * a_Player, cPickup * a_Pickup) override;
+	virtual bool OnCraftingNoRecipe         (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override;
+
+	virtual bool OnDisconnect               (cClientHandle & a_Client, const AString & a_Reason) override;
+	virtual bool OnEntityAddEffect          (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier) override;
+	virtual bool OnExecuteCommand           (cPlayer * a_Player, const AStringVector & a_Split) override;
+	virtual bool OnExploded                 (cWorld & a_World, double a_ExplosionSize,   bool a_CanCauseFire,   double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) override;
+	virtual bool OnExploding                (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) override;
+	virtual bool OnHandshake                (cClientHandle * a_Client, const AString & a_Username) override;
+	virtual bool OnHopperPullingItem        (cWorld & a_World, cHopperEntity & a_Hopper, int a_DstSlotNum, cBlockEntityWithItems & a_SrcEntity, int a_SrcSlotNum) override;
+	virtual bool OnHopperPushingItem        (cWorld & a_World, cHopperEntity & a_Hopper, int a_SrcSlotNum, cBlockEntityWithItems & a_DstEntity, int a_DstSlotNum) override;
+	virtual bool OnKilling                  (cEntity & a_Victim, cEntity * a_Killer, TakeDamageInfo & a_TDI) override;
+	virtual bool OnLogin                    (cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username) override;
+
+	virtual bool OnPlayerAnimation          (cPlayer & a_Player, int a_Animation) override;
+	virtual bool OnPlayerBreakingBlock      (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual bool OnPlayerBrokenBlock        (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual bool OnPlayerDestroyed          (cPlayer & a_Player) override;
+	virtual bool OnPlayerEating             (cPlayer & a_Player) override;
+	virtual bool OnPlayerFished             (cPlayer & a_Player, const cItems & a_Reward) override;
+	virtual bool OnPlayerFishing            (cPlayer & a_Player, cItems & a_Reward) override;
+	virtual bool OnPlayerFoodLevelChange    (cPlayer & a_Player, int a_NewFoodLevel) override;
+	virtual bool OnPlayerJoined             (cPlayer & a_Player) override;
+
+	virtual bool OnPlayerLeftClick          (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, char a_Status) override;
+	virtual bool OnPlayerMoving             (cPlayer & a_Player, const Vector3d & a_OldPosition, const Vector3d & a_NewPosition) override;
+	virtual bool OnPlayerPlacedBlock        (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual bool OnPlayerPlacingBlock       (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual bool OnPlayerRightClick         (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override;
+	virtual bool OnPlayerRightClickingEntity(cPlayer & a_Player, cEntity & a_Entity) override;
+	virtual bool OnPlayerShooting           (cPlayer & a_Player) override;
+	virtual bool OnPlayerSpawned            (cPlayer & a_Player) override;
+	virtual bool OnPlayerTossingItem        (cPlayer & a_Player) override;
+	virtual bool OnPlayerUsedBlock          (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual bool OnPlayerUsedItem           (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override;
+	virtual bool OnPlayerUsingBlock         (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual bool OnPlayerUsingItem          (cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override;
+
+	virtual bool OnPluginMessage            (cClientHandle & a_Client, const AString & a_Channel, const AString & a_Message) override;
+	virtual bool OnPluginsLoaded            (void) override;
+	virtual bool OnPostCrafting             (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override;
+	virtual bool OnPreCrafting              (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override;
+	virtual bool OnProjectileHitBlock       (cProjectileEntity & a_Projectile, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Face, const Vector3d & a_BlockHitPos) override;
+	virtual bool OnProjectileHitEntity      (cProjectileEntity & a_Projectile, cEntity & a_HitEntity) override;
 
 	virtual bool OnServerPing               (cClientHandle & a_ClientHandle, AString & a_ServerDescription, int & a_OnlinePlayersCount, int & a_MaxPlayersCount, AString & a_Favicon) override;
-	virtual bool OnSpawnedEntity            (cWorld & a_World, cEntity & a_Entity) /*override*/;
-	virtual bool OnSpawnedMonster           (cWorld & a_World, cMonster & a_Monster) /*override*/;
-	virtual bool OnSpawningEntity           (cWorld & a_World, cEntity & a_Entity) /*override*/;
-	virtual bool OnSpawningMonster          (cWorld & a_World, cMonster & a_Monster) /*override*/;
-	virtual bool OnTakeDamage               (cEntity & a_Receiver, TakeDamageInfo & a_TakeDamageInfo) /*override*/;
-	virtual bool OnUpdatedSign              (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player) /*override*/;
-	virtual bool OnUpdatingSign             (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ,       AString & a_Line1,       AString & a_Line2,       AString & a_Line3,       AString & a_Line4, cPlayer * a_Player) /*override*/;
-	virtual bool OnWeatherChanged           (cWorld & a_World) /*override*/;
-	virtual bool OnWeatherChanging          (cWorld & a_World, eWeather & a_NewWeather) /*override*/;
-	virtual bool OnWorldStarted             (cWorld & a_World) /*override*/;
-	virtual bool OnWorldTick                (cWorld & a_World, float a_Dt, int a_LastTickDurationMSec) /*override*/;
+	virtual bool OnSpawnedEntity            (cWorld & a_World, cEntity & a_Entity) override;
+	virtual bool OnSpawnedMonster           (cWorld & a_World, cMonster & a_Monster) override;
+	virtual bool OnSpawningEntity           (cWorld & a_World, cEntity & a_Entity) override;
+	virtual bool OnSpawningMonster          (cWorld & a_World, cMonster & a_Monster) override;
+	virtual bool OnTakeDamage               (cEntity & a_Receiver, TakeDamageInfo & a_TakeDamageInfo) override;
+	virtual bool OnUpdatedSign              (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player) override;
+	virtual bool OnUpdatingSign             (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ,       AString & a_Line1,       AString & a_Line2,       AString & a_Line3,       AString & a_Line4, cPlayer * a_Player) override;
+	virtual bool OnWeatherChanged           (cWorld & a_World) override;
+	virtual bool OnWeatherChanging          (cWorld & a_World, eWeather & a_NewWeather) override;
+	virtual bool OnWorldStarted             (cWorld & a_World) override;
+	virtual bool OnWorldTick                (cWorld & a_World, float a_Dt, int a_LastTickDurationMSec) override;
 	
-	virtual bool HandleCommand(const AStringVector & a_Split, cPlayer * a_Player) /*override*/;
+	virtual bool HandleCommand(const AStringVector & a_Split, cPlayer * a_Player) override;
 	
-	virtual bool HandleConsoleCommand(const AStringVector & a_Split, cCommandOutputCallback & a_Output) /*override*/;
+	virtual bool HandleConsoleCommand(const AStringVector & a_Split, cCommandOutputCallback & a_Output) override;
 
-	virtual void ClearCommands(void) /*override*/;
+	virtual void ClearCommands(void) override;
 	
-	virtual void ClearConsoleCommands(void) /*override*/;
+	virtual void ClearConsoleCommands(void) override;
 
 	/** Returns true if the plugin contains the function for the specified hook type, using the old-style registration (#121) */
 	bool CanAddOldStyleHook(int a_HookType);
 	
-	// cWebPlugin /*override*/
+	// cWebPlugin override
 	virtual const AString GetWebTitle(void) const {return GetName(); }
 
 	// cWebPlugin and WebAdmin stuff
-	virtual AString HandleWebRequest(const HTTPRequest * a_Request) /*override*/;
+	virtual AString HandleWebRequest(const HTTPRequest * a_Request) override;
 	bool AddWebTab(const AString & a_Title, lua_State * a_LuaState, int a_FunctionReference);  // >> EXPORTED IN MANUALBINDINGS <<
 	
 	/** Binds the command to call the function specified by a Lua function reference. Simply adds to CommandMap. */
diff --git a/src/BlockArea.h b/src/BlockArea.h
index dbf7b345d..86f7c4f2d 100644
--- a/src/BlockArea.h
+++ b/src/BlockArea.h
@@ -316,9 +316,9 @@ protected:
 		
 		void CopyNibbles(NIBBLETYPE * a_AreaDst, const NIBBLETYPE * a_ChunkSrc);
 		
-		// cChunkDataCallback /*override*/s:
-		virtual bool Coords(int a_ChunkX, int a_ChunkZ) /*override*/;
-		virtual void ChunkData(const cChunkData &  a_BlockTypes) /*override*/;
+		// cChunkDataCallback overrides:
+		virtual bool Coords(int a_ChunkX, int a_ChunkZ) override;
+		virtual void ChunkData(const cChunkData &  a_BlockTypes) override;
 	} ;
 	
 	typedef NIBBLETYPE * NIBBLEARRAY;
diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h
index ebd6cf9be..0d7150aef 100644
--- a/src/BlockEntities/BeaconEntity.h
+++ b/src/BlockEntities/BeaconEntity.h
@@ -35,11 +35,11 @@ public:
 	cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 
 	bool LoadFromJson(const Json::Value & a_Value);
-	// cBlockEntity /*override*/s:
-	virtual void SaveToJson(Json::Value& a_Value) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
+	// cBlockEntity overrides:
+	virtual void SaveToJson(Json::Value& a_Value) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 
 	/** Modify the beacon level. (It is needed to load the beacon corectly) */
 	void SetBeaconLevel(char a_Level) { m_BeaconLevel = a_Level; }
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index d70535e08..5f1639d45 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -43,7 +43,7 @@ public:
 		m_Contents.AddListener(*this);
 	}
 	
-	virtual void Destroy(void) /*override*/
+	virtual void Destroy(void) override
 	{
 		// Drop the contents as pickups:
 		ASSERT(m_World != NULL);
@@ -72,7 +72,7 @@ public:
 protected:
 	cItemGrid m_Contents;
 	
-	// cItemGrid::cListener /*override*/s:
+	// cItemGrid::cListener overrides:
 	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
 	{
 		UNUSED(a_SlotNum);
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index 602aed609..21e1f6ba2 100644
--- a/src/BlockEntities/ChestEntity.cpp
+++ b/src/BlockEntities/ChestEntity.cpp
@@ -141,7 +141,7 @@ void cChestEntity::OpenNewWindow(void)
 		{
 		}
 		
-		virtual bool Item(cChestEntity * a_Chest) /*override*/
+		virtual bool Item(cChestEntity * a_Chest) override
 		{
 			if ((a_Chest->GetPosY() + 1 < cChunkDef::Height) && cBlockInfo::IsSolid(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ())))
 			{
diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h
index 4bb7cdf33..cd06b3e2c 100644
--- a/src/BlockEntities/ChestEntity.h
+++ b/src/BlockEntities/ChestEntity.h
@@ -44,10 +44,10 @@ public:
 
 	bool LoadFromJson(const Json::Value & a_Value);
 	
-	// cBlockEntity /*override*/s:
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
+	// cBlockEntity overrides:
+	virtual void SaveToJson(Json::Value & a_Value) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 	
 	/** Opens a new chest window for this chest.
 	Scans for neighbors to open a double chest window, if appropriate. */
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 7c6f195b5..d02bf7d7b 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -39,11 +39,11 @@ public:
 	cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
 
 	bool LoadFromJson( const Json::Value& a_Value);
-	virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+	virtual void SaveToJson(Json::Value& a_Value) override;
 
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 
 	void SetLastOutput(const AString & a_LastOut);
 
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index ec21791dc..b33d08342 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -33,8 +33,8 @@ public:
 	// tolua_end
 
 private:
-	// cDropSpenser /*override*/s:
-	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) /*override*/;
+	// cDropSpenser overrides:
+	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
 
 	/** If such a bucket can fit, adds it to m_Contents and returns true */
 	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp
index 3fe8ae390..dc38e3e9b 100644
--- a/src/BlockEntities/DropSpenserEntity.cpp
+++ b/src/BlockEntities/DropSpenserEntity.cpp
@@ -2,7 +2,7 @@
 // DropSpenserEntity.cpp
 
 // Declares the cDropSpenserEntity class representing a common ancestor to the cDispenserEntity and cDropperEntity
-// The dropper and dispenser only needs to /*override*/ the DropSpenseFromSlot() function to provide the specific item behavior
+// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior
 
 #include "Globals.h"
 #include "DropSpenserEntity.h"
diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h
index 497e52d14..be56447aa 100644
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -2,7 +2,7 @@
 // DropSpenser.h
 
 // Declares the cDropSpenser class representing a common ancestor to the cDispenserEntity and cDropperEntity
-// The dropper and dispenser only needs to /*override*/ the DropSpenseFromSlot() function to provide the specific item behavior
+// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior
 
 
 
@@ -53,11 +53,11 @@ public:
 
 	bool LoadFromJson(const Json::Value & a_Value);
 	
-	// cBlockEntity /*override*/s:
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/;
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
+	// cBlockEntity overrides:
+	virtual void SaveToJson(Json::Value & a_Value) override;
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 	
 	// tolua_begin
 	
@@ -70,7 +70,7 @@ public:
 	// tolua_end
 	
 	/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate
-	virtual void SetRedstonePower(bool a_IsPowered) /*override*/;
+	virtual void SetRedstonePower(bool a_IsPowered) override;
 
 protected:
 	bool m_ShouldDropSpense;  ///< If true, the dropspenser will dropspense an item in the next tick
diff --git a/src/BlockEntities/DropperEntity.h b/src/BlockEntities/DropperEntity.h
index c87b42cf4..8e07bc6f8 100644
--- a/src/BlockEntities/DropperEntity.h
+++ b/src/BlockEntities/DropperEntity.h
@@ -31,8 +31,8 @@ public:
 	static const char * GetClassStatic(void) { return "cDropperEntity"; }
 
 protected:
-	// cDropSpenserEntity /*override*/s:
-	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) /*override*/;
+	// cDropSpenserEntity overrides:
+	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
 	
 	/** Takes an item from slot a_SlotNum and puts it into the container in front of the dropper.
 	Called when there's a container directly in front of the dropper,
diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
index d3d494b20..ed178f6fc 100644
--- a/src/BlockEntities/EnderChestEntity.h
+++ b/src/BlockEntities/EnderChestEntity.h
@@ -24,10 +24,10 @@ public:
 
 	static const char * GetClassStatic(void) { return "cEnderChestEntity"; }
 	
-	// cBlockEntity /*override*/s:
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/ { UNUSED(a_Value); }
-	virtual void SendTo(cClientHandle & a_Client) /*override*/ { UNUSED(a_Client); }
+	// cBlockEntity overrides:
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SaveToJson(Json::Value & a_Value) override { UNUSED(a_Value); }
+	virtual void SendTo(cClientHandle & a_Client) override { UNUSED(a_Client); }
 
 	static void LoadFromJson(const Json::Value & a_Value, cItemGrid & a_Grid);
 	static void SaveToJson(Json::Value & a_Value, const cItemGrid & a_Grid);
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index 478c54270..89901cf2d 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -40,9 +40,9 @@ public:
 	cFlowerPotEntity(int a_BlocX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 
 	bool LoadFromJson( const Json::Value& a_Value);
-	virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+	virtual void SaveToJson(Json::Value& a_Value) override;
 	
-	virtual void Destroy(void) /*override*/;
+	virtual void Destroy(void) override;
 
 	// tolua_begin
 	
@@ -57,8 +57,8 @@ public:
 	
 	// tolua_end
 	
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
 
 	static bool IsFlower(short m_ItemType, short m_ItemData);
 
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index 474c0c973..cf1a755e0 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -48,11 +48,11 @@ public:
 
 	bool LoadFromJson(const Json::Value & a_Value);
 	
-	// cBlockEntity /*override*/s:
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
+	// cBlockEntity overrides:
+	virtual void SaveToJson(Json::Value & a_Value) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 
 	/// Restarts cooking. Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active. Returns true if cooking.
 	bool ContinueCooking(void);
@@ -152,8 +152,8 @@ protected:
 	/// Sets the m_IsCooking variable, updates the furnace block type based on the value
 	void SetIsCooking(bool a_IsCooking);
 	
-	// cItemGrid::cListener /*override*/s:
-	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+	// cItemGrid::cListener overrides:
+	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
 	
 } ;  // tolua_export
 
diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp
index 59695d5b0..88e7b8e1b 100644
--- a/src/BlockEntities/HopperEntity.cpp
+++ b/src/BlockEntities/HopperEntity.cpp
@@ -209,7 +209,7 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
 		{
 		}
 
-		virtual bool Item(cEntity * a_Entity) /*override*/
+		virtual bool Item(cEntity * a_Entity) override
 		{
 			ASSERT(a_Entity != NULL);
 
diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h
index 5474eb623..8e856fcda 100644
--- a/src/BlockEntities/HopperEntity.h
+++ b/src/BlockEntities/HopperEntity.h
@@ -47,11 +47,11 @@ protected:
 	Int64 m_LastMoveItemsInTick;
 	Int64 m_LastMoveItemsOutTick;
 
-	// cBlockEntity /*override*/s:
-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
+	// cBlockEntity overrides:
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SaveToJson(Json::Value & a_Value) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 	
 	/// Opens a new chest window for this chest. Scans for neighbors to open a double chest window, if appropriate.
 	void OpenNewWindow(void);
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h
index 725585eb3..d677d340f 100644
--- a/src/BlockEntities/JukeboxEntity.h
+++ b/src/BlockEntities/JukeboxEntity.h
@@ -31,7 +31,7 @@ public:
 	virtual ~cJukeboxEntity();
 
 	bool LoadFromJson(const Json::Value & a_Value);
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/;
+	virtual void SaveToJson(Json::Value & a_Value) override;
 
 	// tolua_begin
 	
@@ -57,8 +57,8 @@ public:
 
 	static const char * GetClassStatic(void) { return "cJukeboxEntity"; }
 	
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
-	virtual void SendTo(cClientHandle &) /*override*/ {}
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SendTo(cClientHandle &) override {}
 
 private:
 	int m_Record;
diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index 6fa156d52..f91a3cc9e 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -38,7 +38,7 @@ public:
 	cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 
 	bool LoadFromJson( const Json::Value& a_Value);
-	virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+	virtual void SaveToJson(Json::Value& a_Value) override;
 
 	// tolua_begin
 	
@@ -62,8 +62,8 @@ public:
 	
 	// tolua_end
 	
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
 
 	static const char * GetClassStatic(void) { return "cMobHeadEntity"; }
 	
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index d7b28754c..f538de060 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -45,7 +45,7 @@ public:
 	virtual ~cNoteEntity() {}
 
 	bool LoadFromJson(const Json::Value & a_Value);
-	virtual void SaveToJson(Json::Value & a_Value) /*override*/;
+	virtual void SaveToJson(Json::Value & a_Value) override;
 
 	// tolua_begin
 	
@@ -56,8 +56,8 @@ public:
 	
 	// tolua_end
 	
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
-	virtual void SendTo(cClientHandle &) /*override*/ {}
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SendTo(cClientHandle &) override {}
 	
 	virtual void SetRedstonePower(bool a_Value)
 	{
diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h
index a8e388c47..33af100a4 100644
--- a/src/BlockEntities/SignEntity.h
+++ b/src/BlockEntities/SignEntity.h
@@ -38,7 +38,7 @@ public:
 	cSignEntity(BLOCKTYPE a_BlockType, int a_X, int a_Y, int a_Z, cWorld * a_World);
 
 	bool LoadFromJson( const Json::Value& a_Value);
-	virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+	virtual void SaveToJson(Json::Value& a_Value) override;
 
 	// tolua_begin
 	
@@ -53,8 +53,8 @@ public:
 	
 	// tolua_end
 	
-	virtual void UsedBy(cPlayer * a_Player) /*override*/;
-	virtual void SendTo(cClientHandle & a_Client) /*override*/;
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
 
 	static const char * GetClassStatic(void) { return "cSignEntity"; }
 	
diff --git a/src/BlockInServerPluginInterface.h b/src/BlockInServerPluginInterface.h
index 3ea063a23..e82435364 100644
--- a/src/BlockInServerPluginInterface.h
+++ b/src/BlockInServerPluginInterface.h
@@ -10,7 +10,7 @@ class cBlockInServerPluginInterface : public cBlockPluginInterface
 {
 public:
 	cBlockInServerPluginInterface(cWorld & a_World) : m_World(a_World) {}
-	virtual bool CallHookBlockToPickups(cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cItems & a_Pickups) /*override*/
+	virtual bool CallHookBlockToPickups(cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cItems & a_Pickups) override
 	{
 		return cRoot::Get()->GetPluginManager()->CallHookBlockToPickups(&m_World, a_Digger, a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_Pickups);
 	}
diff --git a/src/Blocks/BlockAnvil.h b/src/Blocks/BlockAnvil.h
index 6607ce5d4..20514580e 100644
--- a/src/Blocks/BlockAnvil.h
+++ b/src/Blocks/BlockAnvil.h
@@ -19,13 +19,13 @@ public:
 	}
 	
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_ANVIL, 1, a_BlockMeta >> 2));
 	}
 
 
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		cWindow * Window = new cAnvilWindow(a_BlockX, a_BlockY, a_BlockZ);
 		a_Player->OpenWindow(Window);
@@ -37,7 +37,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		NIBBLETYPE Meta = (NIBBLETYPE)a_Player->GetEquippedItem().m_ItemDamage;
@@ -58,7 +58,7 @@ public:
 	}
 
 
-	virtual bool IsUseable() /*override*/
+	virtual bool IsUseable() override
 	{
 		return true;
 	}
diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp
index 4b56639db..cd5783f58 100644
--- a/src/Blocks/BlockBed.cpp
+++ b/src/Blocks/BlockBed.cpp
@@ -54,7 +54,7 @@ void cBlockBedHandler::OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInt
 class cTimeFastForwardTester :
 	public cPlayerListCallback
 {
-	virtual bool Item(cPlayer * a_Player) /*override*/
+	virtual bool Item(cPlayer * a_Player) override
 	{
 		if (!a_Player->IsInBed())
 		{
@@ -78,7 +78,7 @@ public:
 	{
 	}
 
-	virtual bool Item(cPlayer * a_Player) /*override*/
+	virtual bool Item(cPlayer * a_Player) override
 	{
 		a_Player->SetIsInBed(false);
 		m_WorldInterface.GetBroadcastManager().BroadcastEntityAnimation(*a_Player, 2);
diff --git a/src/Blocks/BlockBed.h b/src/Blocks/BlockBed.h
index 4b3a7fc18..bf9d9c01d 100644
--- a/src/Blocks/BlockBed.h
+++ b/src/Blocks/BlockBed.h
@@ -21,25 +21,25 @@ public:
 	}
 
 
-	virtual void OnPlacedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/;
+	virtual void OnPlacedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override;
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(E_ITEM_BED, 1, 0));
 	}
 
 
-	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) /*override*/
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
 	{
 		return true;
 	}
diff --git a/src/Blocks/BlockBigFlower.h b/src/Blocks/BlockBigFlower.h
index 6afb46866..72e552dee 100644
--- a/src/Blocks/BlockBigFlower.h
+++ b/src/Blocks/BlockBigFlower.h
@@ -19,7 +19,7 @@ public:
 	}
 
 
-	virtual void DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, bool a_CanDrop, bool a_DropVerbatim) /*override*/
+	virtual void DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, bool a_CanDrop, bool a_DropVerbatim) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		if (Meta & 0x8)
@@ -33,7 +33,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		NIBBLETYPE Meta = a_BlockMeta & 0x7;
 		
@@ -46,7 +46,7 @@ public:
 	}
 
 
-	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		if (Meta & 0x8)
@@ -79,7 +79,7 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR) && (a_RelY < cChunkDef::Height) && ((a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ) == E_BLOCK_AIR) || (a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ) == E_BLOCK_BIG_FLOWER)));
 	}
@@ -90,14 +90,14 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
-	) /*override*/
+	) override
 	{
 		int Meta = (((int)floor(a_Player->GetYaw() * 4.0 / 360.0 + 0.5) & 0x3) + 2) % 4;
 		a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY + 1, a_BlockZ, m_BlockType, 0x8 | Meta);
 	}
 
 
-	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE OldMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 
@@ -120,7 +120,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockBrewingStand.h b/src/Blocks/BlockBrewingStand.h
index 7f8c9e1a4..57642bcb6 100644
--- a/src/Blocks/BlockBrewingStand.h
+++ b/src/Blocks/BlockBrewingStand.h
@@ -16,12 +16,12 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_BREWING_STAND, 1, 0));
 	}
 
-	virtual bool IsUseable() /*override*/
+	virtual bool IsUseable() override
 	{
 		return true;
 	}
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index fb37ac7ef..3b45afff8 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -17,7 +17,7 @@ public:
 	}
 
 	
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		// Set p the ON bit to on
 		NIBBLETYPE Meta = (a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) | 0x08);
@@ -31,14 +31,14 @@ public:
 	}
 
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
@@ -49,7 +49,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = BlockFaceToMetaData(a_BlockFace);
@@ -57,7 +57,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return m_BlockType == E_BLOCK_WOODEN_BUTTON ? "step.wood" : "step.stone";
 	}
@@ -95,7 +95,7 @@ public:
 		}
 	}
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		NIBBLETYPE Meta;
 		a_Chunk.UnboundedRelGetBlockMeta(a_RelX, a_RelY, a_RelZ, Meta);
diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h
index 2061812d6..ed441517d 100644
--- a/src/Blocks/BlockCactus.h
+++ b/src/Blocks/BlockCactus.h
@@ -17,14 +17,14 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
 		{
@@ -65,13 +65,13 @@ public:
 	}
 	
 
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		a_Chunk.GetWorld()->GrowCactus(a_RelX + a_Chunk.GetPosX() * cChunkDef::Width, a_RelY, a_RelZ + a_Chunk.GetPosZ() * cChunkDef::Width, 1);
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.cloth";
 	}
diff --git a/src/Blocks/BlockCake.h b/src/Blocks/BlockCake.h
index ae5f40810..f05f468e5 100644
--- a/src/Blocks/BlockCake.h
+++ b/src/Blocks/BlockCake.h
@@ -15,7 +15,7 @@ public:
 	{
 	}
 	
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 
@@ -34,17 +34,17 @@ public:
 		}
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Give nothing
 	}
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.cloth";
 	}
diff --git a/src/Blocks/BlockCarpet.h b/src/Blocks/BlockCarpet.h
index 567671a23..d1aa52687 100644
--- a/src/Blocks/BlockCarpet.h
+++ b/src/Blocks/BlockCarpet.h
@@ -24,7 +24,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.cloth";
 	}
@@ -35,7 +35,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = a_Player->GetEquippedItem().m_ItemDamage & 0x0f;
@@ -43,13 +43,13 @@ public:
 	}
 
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_CARPET, 1, a_BlockMeta));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return (a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR);
 	}
diff --git a/src/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h
index 1274d7f72..e0f86f4cb 100644
--- a/src/Blocks/BlockCauldron.h
+++ b/src/Blocks/BlockCauldron.h
@@ -16,12 +16,12 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_CAULDRON, 1, 0));
 	}
 
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		switch (a_Player->GetEquippedItem().m_ItemType)
@@ -54,12 +54,12 @@ public:
 		}
 	}
 
-	virtual bool IsUseable() /*override*/
+	virtual bool IsUseable() override
 	{
 		return true;
 	}
 
-	virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		int BlockX = a_RelX + a_Chunk.GetPosX() * cChunkDef::Width;
 		int BlockZ = a_RelZ + a_Chunk.GetPosZ() * cChunkDef::Width;
diff --git a/src/Blocks/BlockChest.h b/src/Blocks/BlockChest.h
index d36f50d3b..28adbed4f 100644
--- a/src/Blocks/BlockChest.h
+++ b/src/Blocks/BlockChest.h
@@ -25,7 +25,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		
@@ -72,7 +72,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
-	) /*override*/
+	) override
 	{
 		// Check if this forms a doublechest, if so, need to adjust the meta:
 		cBlockArea Area;
@@ -107,12 +107,12 @@ public:
 	}
 	
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
 	
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		int BlockX = a_RelX + a_Chunk.GetPosX() * cChunkDef::Width;
 		int BlockZ = a_RelZ + a_Chunk.GetPosZ() * cChunkDef::Width;
@@ -226,7 +226,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
diff --git a/src/Blocks/BlockCloth.h b/src/Blocks/BlockCloth.h
index 75082c8a6..3c1ae7c25 100644
--- a/src/Blocks/BlockCloth.h
+++ b/src/Blocks/BlockCloth.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.cloth";
 	}
diff --git a/src/Blocks/BlockCobWeb.h b/src/Blocks/BlockCobWeb.h
index c26935319..982bfaa30 100644
--- a/src/Blocks/BlockCobWeb.h
+++ b/src/Blocks/BlockCobWeb.h
@@ -19,7 +19,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_STRING, 1, 0));
 	}
diff --git a/src/Blocks/BlockCommandBlock.h b/src/Blocks/BlockCommandBlock.h
index 88461ed65..cf0103765 100644
--- a/src/Blocks/BlockCommandBlock.h
+++ b/src/Blocks/BlockCommandBlock.h
@@ -16,12 +16,12 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_AIR, 8, 0));
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.stone";
 	}
diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index e65dbd275..6caaaab13 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -19,7 +19,7 @@ public:
 	}
 
 	
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		Meta ^= 0x04;  // Toggle 3rd (addition/subtraction) bit with XOR
@@ -27,27 +27,27 @@ public:
 	}
 
 
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		UNUSED(a_ChunkInterface);
 		a_WorldInterface.SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
 		a_Pickups.push_back(cItem(E_ITEM_COMPARATOR, 1, 0));
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 	
 	
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
 	}
@@ -58,7 +58,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-		) /*override*/
+		) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw());
@@ -66,7 +66,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockCrops.h b/src/Blocks/BlockCrops.h
index 0108b3c87..ae6e490e1 100644
--- a/src/Blocks/BlockCrops.h
+++ b/src/Blocks/BlockCrops.h
@@ -19,7 +19,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) override
 	{
 		cFastRandom rand;
 
@@ -74,7 +74,7 @@ public:
 	}
 	
 	
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		NIBBLETYPE Meta     = a_Chunk.GetMeta      (a_RelX, a_RelY, a_RelZ);
 		NIBBLETYPE Light    = a_Chunk.GetBlockLight(a_RelX, a_RelY, a_RelZ);
@@ -96,13 +96,13 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_FARMLAND));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockDeadBush.h b/src/Blocks/BlockDeadBush.h
index 198a49948..5b687c710 100644
--- a/src/Blocks/BlockDeadBush.h
+++ b/src/Blocks/BlockDeadBush.h
@@ -17,13 +17,13 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Don't drop anything
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return (a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_SAND);
 	}
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index 836b51df7..d458c6062 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -19,13 +19,13 @@ public:
 	}
 
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));
 	}
 	
 	
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		if (m_BlockType != E_BLOCK_GRASS)
 		{
@@ -90,7 +90,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.gravel";
 	}
diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h
index 468b44dfa..c86fe829b 100644
--- a/src/Blocks/BlockDoor.h
+++ b/src/Blocks/BlockDoor.h
@@ -16,22 +16,22 @@ class cBlockDoorHandler :
 public:
 	cBlockDoorHandler(BLOCKTYPE a_BlockType);
 
-	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/;
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/;
-	virtual const char * GetStepSound(void) /*override*/;
+	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override;
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override;
+	virtual const char * GetStepSound(void) override;
 
-	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) /*override*/;
-	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta)  /*override*/;
-	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta)  /*override*/;
-	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta)  /*override*/;
+	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override;
+	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta)  override;
+	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta)  override;
+	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta)  override;
 
 	virtual bool GetPlacementBlockTypeMeta(
 		cChunkInterface & a_ChunkInterface, cPlayer * a_Player,
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		// If clicking a bottom face, place the door one block lower:
 		if (a_BlockFace == BLOCK_FACE_BOTTOM)
@@ -53,7 +53,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem((m_BlockType == E_BLOCK_WOODEN_DOOR) ? E_ITEM_WOODEN_DOOR : E_ITEM_IRON_DOOR, 1, 0));
 	}
@@ -64,16 +64,16 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
-	) /*override*/;
+	) override;
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
 	}
diff --git a/src/Blocks/BlockDropSpenser.h b/src/Blocks/BlockDropSpenser.h
index ebcabc066..ba96c716a 100644
--- a/src/Blocks/BlockDropSpenser.h
+++ b/src/Blocks/BlockDropSpenser.h
@@ -27,7 +27,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		
@@ -36,7 +36,7 @@ public:
 		return true;
 	}
 	
-	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override
 	{
 		// Bit 0x08 is a flag. Lowest three bits are position. 0x08 == 1000
 		NIBBLETYPE OtherMeta = a_Meta & 0x08;
diff --git a/src/Blocks/BlockEnchantmentTable.h b/src/Blocks/BlockEnchantmentTable.h
index 274858ff5..81d2cb9a0 100644
--- a/src/Blocks/BlockEnchantmentTable.h
+++ b/src/Blocks/BlockEnchantmentTable.h
@@ -19,14 +19,14 @@ public:
 	}
 
 
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		cWindow * Window = new cEnchantingWindow(a_BlockX, a_BlockY, a_BlockZ);
 		a_Player->OpenWindow(Window);
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
diff --git a/src/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderchest.h
index aed855ac8..4672f1459 100644
--- a/src/Blocks/BlockEnderchest.h
+++ b/src/Blocks/BlockEnderchest.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// todo: Drop Ender Chest if using silk touch pickaxe
 		a_Pickups.push_back(cItem(E_BLOCK_OBSIDIAN, 8, 0));
@@ -27,14 +27,14 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-		) /*override*/
+		) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = RotationToMetaData(a_Player->GetYaw());
 		return true;
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.stone";
 	}
diff --git a/src/Blocks/BlockEntity.h b/src/Blocks/BlockEntity.h
index 876e62312..7f86a22b2 100644
--- a/src/Blocks/BlockEntity.h
+++ b/src/Blocks/BlockEntity.h
@@ -15,12 +15,12 @@ public:
 	{
 	}
 	
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		a_ChunkInterface.UseBlockEntity(a_Player, a_BlockX, a_BlockY, a_BlockZ);
 	}
 	
-	virtual bool IsUseable() /*override*/
+	virtual bool IsUseable() override
 	{
 		return true;
 	}
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h
index e26b7f45a..bb624e54f 100644
--- a/src/Blocks/BlockFarmland.h
+++ b/src/Blocks/BlockFarmland.h
@@ -26,7 +26,7 @@ public:
 	{
 	}
 
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		bool Found = false;
 		
@@ -101,7 +101,7 @@ public:
 		}
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.Add(E_BLOCK_DIRT, 1, 0);  // Reset meta
 	}
diff --git a/src/Blocks/BlockFenceGate.h b/src/Blocks/BlockFenceGate.h
index ed1deffdc..ae99a4f94 100644
--- a/src/Blocks/BlockFenceGate.h
+++ b/src/Blocks/BlockFenceGate.h
@@ -22,7 +22,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = PlayerYawToMetaData(a_Player->GetYaw());
@@ -30,7 +30,7 @@ public:
 	}
 
 
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		NIBBLETYPE OldMetaData = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		NIBBLETYPE NewMetaData = PlayerYawToMetaData(a_Player->GetYaw());
@@ -50,13 +50,13 @@ public:
 	}
 
 
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		a_WorldInterface.SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
diff --git a/src/Blocks/BlockFire.h b/src/Blocks/BlockFire.h
index 469247fc1..b9f211042 100644
--- a/src/Blocks/BlockFire.h
+++ b/src/Blocks/BlockFire.h
@@ -21,7 +21,7 @@ public:
 	int XZP, XZM;
 	NIBBLETYPE Dir;
 
-	virtual void OnPlaced(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void OnPlaced(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override
 	{
 		/*
 		PORTAL FINDING ALGORITH
@@ -40,17 +40,17 @@ public:
 		FindAndSetPortalFrame(a_BlockX, a_BlockY - 1, a_BlockZ, a_ChunkInterface, a_WorldInterface);
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// No pickups from this block
 	}
 
-	virtual bool IsClickedThrough(void) /*override*/
+	virtual bool IsClickedThrough(void) override
 	{
 		return true;
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockFlower.h b/src/Blocks/BlockFlower.h
index 7439d6641..6f64c062b 100644
--- a/src/Blocks/BlockFlower.h
+++ b/src/Blocks/BlockFlower.h
@@ -17,20 +17,20 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return (a_RelY > 0) && IsBlockTypeOfDirt(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockFlowerPot.h b/src/Blocks/BlockFlowerPot.h
index b052d4715..fc75ef638 100644
--- a/src/Blocks/BlockFlowerPot.h
+++ b/src/Blocks/BlockFlowerPot.h
@@ -17,7 +17,7 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_FLOWER_POT, 1, 0));
 	}
diff --git a/src/Blocks/BlockFluid.h b/src/Blocks/BlockFluid.h
index c94d8e399..8c0aae041 100644
--- a/src/Blocks/BlockFluid.h
+++ b/src/Blocks/BlockFluid.h
@@ -20,19 +20,19 @@ public:
 	}
 	
 		
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// No pickups
 	}
 	
 	
-	virtual bool DoesIgnoreBuildCollision(void) /*override*/
+	virtual bool DoesIgnoreBuildCollision(void) override
 	{
 		return true;
 	}
 	
 	
-	virtual void Check(cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) /*override*/
+	virtual void Check(cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) override
 	{
 		switch (m_BlockType)
 		{
@@ -51,7 +51,7 @@ public:
 	}
 
 
-	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) /*override*/
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
 	{
 		return false;
 	}
@@ -74,7 +74,7 @@ public:
 	
 	
 	/// Called to tick the block
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		if (a_Chunk.GetWorld()->ShouldLavaSpawnFire())
 		{
diff --git a/src/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h
index e88d8fc53..2c7310ac9 100644
--- a/src/Blocks/BlockFurnace.h
+++ b/src/Blocks/BlockFurnace.h
@@ -19,7 +19,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_FURNACE, 1, 0));
 	}
@@ -30,7 +30,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		
diff --git a/src/Blocks/BlockGlass.h b/src/Blocks/BlockGlass.h
index f3435b199..f6958bbb6 100644
--- a/src/Blocks/BlockGlass.h
+++ b/src/Blocks/BlockGlass.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 	}
 } ;
diff --git a/src/Blocks/BlockGlowstone.h b/src/Blocks/BlockGlowstone.h
index b94cdaa25..d1353e29a 100644
--- a/src/Blocks/BlockGlowstone.h
+++ b/src/Blocks/BlockGlowstone.h
@@ -17,7 +17,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
 		cFastRandom Random;
diff --git a/src/Blocks/BlockGravel.h b/src/Blocks/BlockGravel.h
index a09ad159a..e1c9ff390 100644
--- a/src/Blocks/BlockGravel.h
+++ b/src/Blocks/BlockGravel.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.gravel";
 	}
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 73a1deecf..6767d4de4 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -409,7 +409,7 @@ void cBlockHandler::NeighborChanged(cChunkInterface & a_ChunkInterface, int a_Bl
 
 void cBlockHandler::ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta)
 {
-	// Setting the meta to a_BlockMeta keeps most textures. The few other blocks have to /*override*/ this.
+	// Setting the meta to a_BlockMeta keeps most textures. The few other blocks have to override this.
 	a_Pickups.push_back(cItem(m_BlockType, 1, a_BlockMeta));
 }
 
diff --git a/src/Blocks/BlockHayBale.h b/src/Blocks/BlockHayBale.h
index d00bf79fe..3c6472adb 100644
--- a/src/Blocks/BlockHayBale.h
+++ b/src/Blocks/BlockHayBale.h
@@ -17,7 +17,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockHopper.h b/src/Blocks/BlockHopper.h
index 62c47a999..4a5d32dd5 100644
--- a/src/Blocks/BlockHopper.h
+++ b/src/Blocks/BlockHopper.h
@@ -22,7 +22,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		
@@ -41,7 +41,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override
 	{
 		// Bit 0x08 is a flag.  Lowest three bits are position.  0x08 == 1000
 		NIBBLETYPE OtherMeta = a_Meta & 0x08;
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h
index 9aa769a5a..47a84e5a7 100644
--- a/src/Blocks/BlockIce.h
+++ b/src/Blocks/BlockIce.h
@@ -18,13 +18,13 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// No pickups
 	}
 	
 	
-	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		if (a_Player->IsGameModeCreative() || (a_BlockY <= 0))
 		{
diff --git a/src/Blocks/BlockLadder.h b/src/Blocks/BlockLadder.h
index 6dbb41c5d..284d1d732 100644
--- a/src/Blocks/BlockLadder.h
+++ b/src/Blocks/BlockLadder.h
@@ -25,7 +25,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		if (!LadderCanBePlacedAt(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace))
 		{
@@ -43,7 +43,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.Add(m_BlockType, 1, 0);  // Reset meta
 	}
@@ -103,7 +103,7 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		// TODO: Use AdjustCoordsByMeta(), then cChunk::UnboundedRelGetBlock() and finally some comparison
 		eBlockFace BlockFace = MetaDataToDirection(a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ));
@@ -113,7 +113,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h
index 7c804367a..a8aa28a0f 100644
--- a/src/Blocks/BlockLeaves.h
+++ b/src/Blocks/BlockLeaves.h
@@ -36,7 +36,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		cFastRandom rand;
 
@@ -63,14 +63,14 @@ public:
 	}
 	
 	
-	virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0x7);  // Unset 0x8 bit so it gets checked for decay
 	}
 	
 	
-	virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
 		if ((Meta & 0x04) != 0)
@@ -114,7 +114,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockLever.h b/src/Blocks/BlockLever.h
index 5e4e6056b..4316fd06b 100644
--- a/src/Blocks/BlockLever.h
+++ b/src/Blocks/BlockLever.h
@@ -17,7 +17,7 @@ public:
 	{
 	}
 	
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		// Flip the ON bit on/off using the XOR bitwise operation
 		NIBBLETYPE Meta = (a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08);
@@ -28,14 +28,14 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
 		a_Pickups.push_back(cItem(E_BLOCK_LEVER, 1, 0));
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
@@ -46,7 +46,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = LeverDirectionToMetaData(a_BlockFace);
@@ -70,7 +70,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
@@ -97,7 +97,7 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		NIBBLETYPE Meta;
 		a_Chunk.UnboundedRelGetBlockMeta(a_RelX, a_RelY, a_RelZ, Meta);
@@ -109,7 +109,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override
 	{
 		switch (a_Meta)
 		{
@@ -124,7 +124,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override
 	{
 		switch (a_Meta)
 		{
diff --git a/src/Blocks/BlockMelon.h b/src/Blocks/BlockMelon.h
index fab06bccc..60202d66e 100644
--- a/src/Blocks/BlockMelon.h
+++ b/src/Blocks/BlockMelon.h
@@ -17,14 +17,14 @@ public:
 	}
 	
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		cFastRandom Random;
 		a_Pickups.push_back(cItem(E_ITEM_MELON_SLICE, (char)(3 + Random.NextInt(5)), 0));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockMobHead.h b/src/Blocks/BlockMobHead.h
index 18a3e2b61..ff1ef97bf 100644
--- a/src/Blocks/BlockMobHead.h
+++ b/src/Blocks/BlockMobHead.h
@@ -17,12 +17,12 @@ public:
 	{
 	}
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// The drop spawn is in OnDestroyed method
 	}
 	
-	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		if (a_Player->IsGameModeCreative())
 		{
@@ -197,7 +197,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
-	) /*override*/
+	) override
 	{
 		class cCallback : public cBlockEntityCallback
 		{
diff --git a/src/Blocks/BlockMushroom.h b/src/Blocks/BlockMushroom.h
index 9996b8d73..135d418d7 100644
--- a/src/Blocks/BlockMushroom.h
+++ b/src/Blocks/BlockMushroom.h
@@ -20,14 +20,14 @@ public:
 	// TODO: Add Mushroom Spread
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
 		{
@@ -52,7 +52,7 @@ public:
 	}
 	
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockMycelium.h b/src/Blocks/BlockMycelium.h
index c8f601171..2a8ef5fca 100644
--- a/src/Blocks/BlockMycelium.h
+++ b/src/Blocks/BlockMycelium.h
@@ -18,12 +18,12 @@ public:
 
 	// TODO: Add Mycel Spread
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));
 	}
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.gravel";
 	}
diff --git a/src/Blocks/BlockNetherWart.h b/src/Blocks/BlockNetherWart.h
index e606637f6..812cf906f 100644
--- a/src/Blocks/BlockNetherWart.h
+++ b/src/Blocks/BlockNetherWart.h
@@ -19,7 +19,7 @@ public:
 	}
 
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) override
 	{
 		cFastRandom rand;
 
@@ -35,7 +35,7 @@ public:
 	}
 
 
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
 		if (Meta < 7)
@@ -45,7 +45,7 @@ public:
 	}
 	
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		// Needs to be placed on top of a Soulsand block:
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_SOULSAND));
diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h
index d9342193d..0067d475f 100644
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@@ -17,7 +17,7 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		cFastRandom Random;
 
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index b71ef5db6..0bec603e3 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -13,14 +13,14 @@ class cBlockPistonHandler :
 public:
 	cBlockPistonHandler(BLOCKTYPE a_BlockType);
 	
-	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
+	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override;
 
 	virtual bool GetPlacementBlockTypeMeta(
 		cChunkInterface & a_ChunkInterface, cPlayer * a_Player,
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/;
+	) override;
 
 	static NIBBLETYPE RotationPitchToMetaData(double a_Rotation, double a_Pitch)
 	{
@@ -155,9 +155,9 @@ class cBlockPistonHeadHandler :
 public:
 	cBlockPistonHeadHandler(void);
 	
-	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
+	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override;
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// No pickups
 		// Also with 1.7, the item forms of these technical blocks have been removed, so giving someone this will crash their client...
diff --git a/src/Blocks/BlockPlanks.h b/src/Blocks/BlockPlanks.h
index 8b3e34a4b..4c5bb4860 100644
--- a/src/Blocks/BlockPlanks.h
+++ b/src/Blocks/BlockPlanks.h
@@ -21,7 +21,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
@@ -29,7 +29,7 @@ public:
 	}
 
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h
index 84db103e6..8fac2a126 100644
--- a/src/Blocks/BlockPortal.h
+++ b/src/Blocks/BlockPortal.h
@@ -22,7 +22,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		// We set to zero so MCS doesn't stop you from building weird portals like vanilla does
 		// CanBeAt doesn't do anything if meta is zero
@@ -34,12 +34,12 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// No pickups
 	}
 
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		cFastRandom Random;
 		if (Random.NextInt(2000) != 0)
@@ -53,7 +53,7 @@ public:
 		a_WorldInterface.SpawnMob(PosX, a_RelY, PosZ, cMonster::mtZombiePigman);
 	}
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if ((a_RelY <= 0) || (a_RelY >= cChunkDef::Height))
 		{
diff --git a/src/Blocks/BlockPressurePlate.h b/src/Blocks/BlockPressurePlate.h
index b23fa2bb5..a5c34a776 100644
--- a/src/Blocks/BlockPressurePlate.h
+++ b/src/Blocks/BlockPressurePlate.h
@@ -15,13 +15,13 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
 		{
diff --git a/src/Blocks/BlockPumpkin.h b/src/Blocks/BlockPumpkin.h
index e0cfa4579..15ac80fd7 100644
--- a/src/Blocks/BlockPumpkin.h
+++ b/src/Blocks/BlockPumpkin.h
@@ -17,7 +17,7 @@ public:
 	}
 
 	
-	virtual void OnPlacedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void OnPlacedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override
 	{
 		// Check whether the pumpkin is a part of a golem or a snowman
 		
@@ -86,7 +86,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = PlayerYawToMetaData(a_Player->GetYaw());
diff --git a/src/Blocks/BlockQuartz.h b/src/Blocks/BlockQuartz.h
index f36d384e0..edc4fb9c5 100644
--- a/src/Blocks/BlockQuartz.h
+++ b/src/Blocks/BlockQuartz.h
@@ -21,7 +21,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h
index 10f585ea2..87ce069ab 100644
--- a/src/Blocks/BlockRail.h
+++ b/src/Blocks/BlockRail.h
@@ -34,7 +34,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = FindMeta(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);
@@ -42,7 +42,7 @@ public:
 	}
 
 
-	virtual void OnPlaced(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void OnPlaced(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override
 	{
 		super::OnPlaced(a_ChunkInterface, a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta);
 
@@ -59,7 +59,7 @@ public:
 	}
 
 
-	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		super::OnDestroyed(a_ChunkInterface, a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ);
 
@@ -76,7 +76,7 @@ public:
 	}
 
 
-	virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		if (IsUnstable(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ) && (Meta != FindMeta(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ)))
@@ -86,13 +86,13 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		super::ConvertToPickups(a_Pickups, 0);
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
 		{
@@ -437,7 +437,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override
 	{
 		// Bit 0x08 is a flag when a_Meta is in the range 0x00--0x05 and 0x0A--0x0F.
 		// Bit 0x08 specifies direction when a_Meta is in the range 0x06-0x09.
@@ -474,7 +474,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override
 	{
 		// Bit 0x08 is a flag for value in the range 0x00--0x05 and specifies direction for values withint 0x006--0x09.
 		if ((a_Meta < 0x06) || (a_Meta > 0x09))
@@ -510,7 +510,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override
 	{
 		// Bit 0x08 is a flag for value in the range 0x00--0x05 and specifies direction for values withint 0x006--0x09.
 		if ((a_Meta < 0x06) || (a_Meta > 0x09))
@@ -541,7 +541,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override
 	{
 		// Bit 0x08 is a flag for value in the range 0x00--0x05 and specifies direction for values withint 0x006--0x09.
 		if ((a_Meta < 0x06) || (a_Meta > 0x09))
diff --git a/src/Blocks/BlockRedstone.h b/src/Blocks/BlockRedstone.h
index 651736aa4..37d61ed73 100644
--- a/src/Blocks/BlockRedstone.h
+++ b/src/Blocks/BlockRedstone.h
@@ -18,13 +18,13 @@ public:
 	}
 	
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && cBlockInfo::FullyOccupiesVoxel(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)));
 	}
 	
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(E_ITEM_REDSTONE_DUST, 1, 0));
diff --git a/src/Blocks/BlockRedstoneLamp.h b/src/Blocks/BlockRedstoneLamp.h
index e4f290fdd..69a2b27c2 100644
--- a/src/Blocks/BlockRedstoneLamp.h
+++ b/src/Blocks/BlockRedstoneLamp.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_REDSTONE_LAMP_OFF, 1, 0));
 	}
diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h
index 44b9e6197..4b18add12 100644
--- a/src/Blocks/BlockRedstoneRepeater.h
+++ b/src/Blocks/BlockRedstoneRepeater.h
@@ -23,7 +23,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = RepeaterRotationToMetaData(a_Player->GetYaw());
@@ -31,39 +31,39 @@ public:
 	}
 
 
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, ((a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f));
 	}
 
 
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		UNUSED(a_ChunkInterface);
 		a_WorldInterface.SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(E_ITEM_REDSTONE_REPEATER, 1, 0));
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 	
 	
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && cBlockInfo::IsSolid(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockRedstoneTorch.h b/src/Blocks/BlockRedstoneTorch.h
index 4d55cff28..cb897ba3f 100644
--- a/src/Blocks/BlockRedstoneTorch.h
+++ b/src/Blocks/BlockRedstoneTorch.h
@@ -18,14 +18,14 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Always drop the ON torch, meta 0
 		a_Pickups.push_back(cItem(E_BLOCK_REDSTONE_TORCH_ON, 1, 0));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockSand.h b/src/Blocks/BlockSand.h
index e99b0098d..3fc271483 100644
--- a/src/Blocks/BlockSand.h
+++ b/src/Blocks/BlockSand.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.sand";
 	}
diff --git a/src/Blocks/BlockSapling.h b/src/Blocks/BlockSapling.h
index 8abb35046..de28273d5 100644
--- a/src/Blocks/BlockSapling.h
+++ b/src/Blocks/BlockSapling.h
@@ -18,20 +18,20 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Only the first 2 bits contain the display information and the 4th bit is for the growth indicator, but, we use 0x07 for forward compatibility
 		a_Pickups.push_back(cItem(E_BLOCK_SAPLING, 1, a_BlockMeta & 0x07));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return (a_RelY > 0) && IsBlockTypeOfDirt(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ));
 	}
 	
 
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
 		
@@ -48,7 +48,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h
index 7cfe3043d..f5f10899d 100644
--- a/src/Blocks/BlockSideways.h
+++ b/src/Blocks/BlockSideways.h
@@ -21,7 +21,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
@@ -30,7 +30,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3);  // Reset meta
 	}
@@ -67,7 +67,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h
index dabd8369b..d0cc760b0 100644
--- a/src/Blocks/BlockSignPost.h
+++ b/src/Blocks/BlockSignPost.h
@@ -21,19 +21,19 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_SIGN, 1, 0));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
 		{
@@ -64,25 +64,25 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_Player->GetClientHandle()->SendEditSign(a_BlockX, a_BlockY, a_BlockZ);
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override
 	{
 		return (a_Meta + 4) & 0x0f;
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override
 	{
 		return (a_Meta + 12) & 0x0f;
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override
 	{
 		// Mirrors signs over the XY plane (North-South Mirroring)
 
@@ -92,7 +92,7 @@ public:
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override
 	{
 		// Mirrors signs over the YZ plane (East-West Mirroring)
 
diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h
index 611b7653b..e67f0e8b3 100644
--- a/src/Blocks/BlockSlab.h
+++ b/src/Blocks/BlockSlab.h
@@ -25,7 +25,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(m_BlockType, 1, a_BlockMeta & 0x7));
 	}
@@ -36,7 +36,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		NIBBLETYPE Meta = (NIBBLETYPE) a_Player->GetEquippedItem().m_ItemDamage;
@@ -87,7 +87,7 @@ public:
 	}
 	
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		switch (m_BlockType)
 		{
@@ -99,7 +99,7 @@ public:
 	}
 
 
-	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) /*override*/
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
 	{
 		return ((a_Meta & 0x8) != 0);
 	}
@@ -112,7 +112,7 @@ public:
 	}
 
 
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		if ((a_BlockFace == BLOCK_FACE_NONE) || (a_Player->GetEquippedItem().m_ItemType != (short)m_BlockType))
 		{
@@ -137,7 +137,7 @@ public:
 	}
 	
 	
-	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override
 	{
 		// Toggle the 4th bit - up / down:
 		return (a_Meta ^ 0x08);
@@ -158,7 +158,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		BLOCKTYPE Block = GetSingleSlabType(m_BlockType);
 		a_Pickups.push_back(cItem(Block, 2, a_BlockMeta & 0x7));
@@ -175,7 +175,7 @@ public:
 		return a_BlockType;
 	}
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		switch (m_BlockType)
 		{
diff --git a/src/Blocks/BlockSnow.h b/src/Blocks/BlockSnow.h
index 057dda48c..977f19a16 100644
--- a/src/Blocks/BlockSnow.h
+++ b/src/Blocks/BlockSnow.h
@@ -22,7 +22,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 
@@ -43,7 +43,7 @@ public:
 	}
 
 
-	virtual bool DoesIgnoreBuildCollision(cPlayer * a_Player, NIBBLETYPE a_Meta) /*override*/
+	virtual bool DoesIgnoreBuildCollision(cPlayer * a_Player, NIBBLETYPE a_Meta) override
 	{
 		if ((a_Player->GetEquippedItem().m_ItemType == E_BLOCK_SNOW) && (a_Meta < 7))
 		{
@@ -59,13 +59,13 @@ public:
 	}
 	
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_SNOWBALL, 1, 0));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY > 0)
 		{
@@ -83,13 +83,13 @@ public:
 	}
 	
 	
-	virtual bool DoesDropOnUnsuitable(void) /*override*/
+	virtual bool DoesDropOnUnsuitable(void) override
 	{
 		return false;
 	}
 	
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.cloth";
 	}
diff --git a/src/Blocks/BlockStairs.h b/src/Blocks/BlockStairs.h
index 5e9d9a117..417969a82 100644
--- a/src/Blocks/BlockStairs.h
+++ b/src/Blocks/BlockStairs.h
@@ -23,7 +23,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		UNUSED(a_ChunkInterface);
 		UNUSED(a_BlockX);
@@ -55,7 +55,7 @@ public:
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		if (
 			(m_BlockType == E_BLOCK_WOODEN_STAIRS) ||
@@ -73,14 +73,14 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
 
-	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) /*override*/
+	virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override
 	{
 		return true;
 	}
@@ -111,7 +111,7 @@ public:
 		}
 	}
 
-	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override
 	{
 		// Toggle bit 3:
 		return (a_Meta & 0x0b) | ((~a_Meta) & 0x04);
diff --git a/src/Blocks/BlockStems.h b/src/Blocks/BlockStems.h
index 979972256..b726a0901 100644
--- a/src/Blocks/BlockStems.h
+++ b/src/Blocks/BlockStems.h
@@ -18,14 +18,14 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		short ItemType = (m_BlockType == E_BLOCK_MELON_STEM) ? E_ITEM_MELON_SEEDS : E_ITEM_PUMPKIN_SEEDS;
 		a_Pickups.push_back(cItem(ItemType, 1, 0));
 	}
 
 	
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
 		if (Meta >= 7)
@@ -43,13 +43,13 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_FARMLAND));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockStone.h b/src/Blocks/BlockStone.h
index 2247f3aa8..cd5230f49 100644
--- a/src/Blocks/BlockStone.h
+++ b/src/Blocks/BlockStone.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
 	}
diff --git a/src/Blocks/BlockSugarcane.h b/src/Blocks/BlockSugarcane.h
index 519ec3836..5902c791b 100644
--- a/src/Blocks/BlockSugarcane.h
+++ b/src/Blocks/BlockSugarcane.h
@@ -17,13 +17,13 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_SUGARCANE, 1, 0));
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
 		{
@@ -74,13 +74,13 @@ public:
 	}
 	
 	
-	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/
+	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		a_Chunk.GetWorld()->GrowSugarcane(a_RelX + a_Chunk.GetPosX() * cChunkDef::Width, a_RelY, a_RelZ + a_Chunk.GetPosZ() * cChunkDef::Width, 1);
 	}
 	
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockTNT.h b/src/Blocks/BlockTNT.h
index a2cbedbef..283a03730 100644
--- a/src/Blocks/BlockTNT.h
+++ b/src/Blocks/BlockTNT.h
@@ -16,12 +16,12 @@ public:
 	{
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
 
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		a_WorldInterface.SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
 	}
diff --git a/src/Blocks/BlockTallGrass.h b/src/Blocks/BlockTallGrass.h
index badabfa4d..9c008f793 100644
--- a/src/Blocks/BlockTallGrass.h
+++ b/src/Blocks/BlockTallGrass.h
@@ -17,13 +17,13 @@ public:
 	}
 
 
-	virtual bool DoesIgnoreBuildCollision(void) /*override*/
+	virtual bool DoesIgnoreBuildCollision(void) override
 	{
 		return true;
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Drop seeds, sometimes
 		MTRand r1;
@@ -34,7 +34,7 @@ public:
 	}
 
 
-	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 		
@@ -49,13 +49,13 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index d8def598e..df5574d5d 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -22,7 +22,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		// Find proper placement of torch
 
@@ -145,7 +145,7 @@ public:
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		eBlockFace Face = MetaDataToDirection(a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ));
 
@@ -179,14 +179,14 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Always drop meta = 0
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h
index 2c8ab4010..a6327b5c2 100644
--- a/src/Blocks/BlockTrapdoor.h
+++ b/src/Blocks/BlockTrapdoor.h
@@ -16,23 +16,23 @@ public:
 	{
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
 	}
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		// Flip the ON bit on/off using the XOR bitwise operation
 		NIBBLETYPE Meta = (a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x04);
@@ -42,7 +42,7 @@ public:
 		World->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
 	}
 
-	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		UNUSED(a_ChunkInterface);
 		a_WorldInterface.SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
@@ -53,7 +53,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = BlockFaceToMetaData(a_BlockFace);
@@ -97,7 +97,7 @@ public:
 		}
 	}
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		NIBBLETYPE Meta;
 		a_Chunk.UnboundedRelGetBlockMeta(a_RelX, a_RelY, a_RelZ, Meta);
diff --git a/src/Blocks/BlockTripwire.h b/src/Blocks/BlockTripwire.h
index eac586847..3ab17bf4a 100644
--- a/src/Blocks/BlockTripwire.h
+++ b/src/Blocks/BlockTripwire.h
@@ -16,12 +16,12 @@ public:
 	{
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_STRING, 1, 0));
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "";
 	}
diff --git a/src/Blocks/BlockTripwireHook.h b/src/Blocks/BlockTripwireHook.h
index 4dc6460fe..4f9d79483 100644
--- a/src/Blocks/BlockTripwireHook.h
+++ b/src/Blocks/BlockTripwireHook.h
@@ -21,7 +21,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = m_BlockType;
 		a_BlockMeta = DirectionToMetadata(a_BlockFace);
@@ -53,13 +53,13 @@ public:
 		}
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(E_BLOCK_TRIPWIRE_HOOK, 1, 0));
 	}
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		NIBBLETYPE Meta;
 		a_Chunk.UnboundedRelGetBlockMeta(a_RelX, a_RelY, a_RelZ, Meta);
@@ -71,7 +71,7 @@ public:
 		return ((a_RelY > 0) && cBlockInfo::FullyOccupiesVoxel(BlockIsOn));
 	}
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h
index 93d61d80f..578224c61 100644
--- a/src/Blocks/BlockVine.h
+++ b/src/Blocks/BlockVine.h
@@ -21,7 +21,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		UNUSED(a_Player);
 		UNUSED(a_CursorX);
@@ -44,7 +44,7 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to zero
 		a_Pickups.push_back(cItem(E_BLOCK_VINES, 1, 0));
@@ -115,7 +115,7 @@ public:
 	}
 	
 	
-	void Check(cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) /*override*/
+	void Check(cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) override
 	{
 		NIBBLETYPE CurMeta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
 		NIBBLETYPE MaxMeta = GetMaxMeta(a_Chunk, a_RelX, a_RelY, a_RelZ);
@@ -155,19 +155,19 @@ public:
 	}
 
 
-	virtual bool DoesIgnoreBuildCollision(void) /*override*/
+	virtual bool DoesIgnoreBuildCollision(void) override
 	{
 		return true;
 	}
 	
 	
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
 
 
-	virtual bool DoesDropOnUnsuitable(void) /*override*/
+	virtual bool DoesDropOnUnsuitable(void) override
 	{
 		return false;
 	}
@@ -189,26 +189,26 @@ public:
 		}
 	}
 	
-	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override
 	{
 		return ((a_Meta >> 1) | (a_Meta << 3)) & 0x0f;  // Rotate bits to the right
 	}
 
 
-	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override
 	{
 		return ((a_Meta << 1) | (a_Meta >> 3)) & 0x0f;  // Rotate bits to the left
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override
 	{
 		// Bits 2 and 4 stay, bits 1 and 3 swap
 		return (NIBBLETYPE)((a_Meta & 0x0a) | ((a_Meta & 0x01) << 2) | ((a_Meta & 0x04) >> 2));
 	}
 
 
-	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) /*override*/
+	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override
 	{
 		// Bits 1 and 3 stay, bits 2 and 4 swap
 		return (NIBBLETYPE)((a_Meta & 0x05) | ((a_Meta & 0x02) << 2) | ((a_Meta & 0x08) >> 2));
diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h
index 26e63b1b5..47649379e 100644
--- a/src/Blocks/BlockWallSign.h
+++ b/src/Blocks/BlockWallSign.h
@@ -21,13 +21,13 @@ public:
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(E_ITEM_SIGN, 1, 0));
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
@@ -38,13 +38,13 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_Player->GetClientHandle()->SendEditSign(a_BlockX, a_BlockY, a_BlockZ);
 	}
 
 
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) /*override*/
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		int BlockX = (a_Chunk.GetPosX() * cChunkDef::Width) + a_RelX;
 		int BlockZ = (a_Chunk.GetPosZ() * cChunkDef::Width) + a_RelZ;
diff --git a/src/Blocks/BlockWorkbench.h b/src/Blocks/BlockWorkbench.h
index 3c1336779..70468369c 100644
--- a/src/Blocks/BlockWorkbench.h
+++ b/src/Blocks/BlockWorkbench.h
@@ -19,20 +19,20 @@ public:
 	}
 	
 	
-	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) /*override*/
+	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		cWindow * Window = new cCraftingWindow(a_BlockX, a_BlockY, a_BlockZ);
 		a_Player->OpenWindow(Window);
 	}
 
 
-	virtual bool IsUseable(void) /*override*/
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 
 
-	virtual const char * GetStepSound(void) /*override*/
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
diff --git a/src/Blocks/ChunkInterface.h b/src/Blocks/ChunkInterface.h
index 57aded66d..dea9d7c7e 100644
--- a/src/Blocks/ChunkInterface.h
+++ b/src/Blocks/ChunkInterface.h
@@ -71,12 +71,12 @@ public:
 		m_ChunkMap->UseBlockEntity(a_Player, a_BlockX, a_BlockY, a_BlockZ);
 	}
 	
-	virtual bool ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a_MinChunkZ, int a_MaxChunkZ, cChunkDataCallback & a_Callback) /*override*/
+	virtual bool ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a_MinChunkZ, int a_MaxChunkZ, cChunkDataCallback & a_Callback) override
 	{
 		return m_ChunkMap->ForEachChunkInRect(a_MinChunkX, a_MaxChunkX, a_MinChunkZ, a_MaxChunkZ, a_Callback);
 	}
 	
-	virtual bool WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) /*override*/
+	virtual bool WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) override
 	{
 		return m_ChunkMap->WriteBlockArea(a_Area, a_MinBlockX, a_MinBlockY, a_MinBlockZ, a_DataTypes);
 	}
diff --git a/src/Blocks/ClearMetaOnDrop.h b/src/Blocks/ClearMetaOnDrop.h
index 68381de34..aa4f23848 100644
--- a/src/Blocks/ClearMetaOnDrop.h
+++ b/src/Blocks/ClearMetaOnDrop.h
@@ -17,7 +17,7 @@ public:
 	{}
 	
 	virtual ~cClearMetaOnDrop() {}
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		a_Pickups.push_back(cItem(this->m_BlockType));
 	}
diff --git a/src/Blocks/MetaRotator.h b/src/Blocks/MetaRotator.h
index 0bf450e9c..4c268077a 100644
--- a/src/Blocks/MetaRotator.h
+++ b/src/Blocks/MetaRotator.h
@@ -31,10 +31,10 @@ public:
 	
 	virtual ~cMetaRotator() {}
 
-	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta)  /*override*/;
-	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta)  /*override*/;
-	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta)  /*override*/;
-	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta)  /*override*/;
+	virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta)  override;
+	virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta)  override;
+	virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta)  override;
+	virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta)  override;
 };
 
 
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 782229f52..9fb178bc3 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -669,12 +669,12 @@ void cChunk::MoveEntityToNewChunk(cEntity * a_Entity)
 	class cMover :
 		public cClientDiffCallback
 	{
-		virtual void Removed(cClientHandle * a_Client) /*override*/
+		virtual void Removed(cClientHandle * a_Client) override
 		{
 			a_Client->SendDestroyEntity(*m_Entity);
 		}
 
-		virtual void Added(cClientHandle * a_Client) /*override*/
+		virtual void Added(cClientHandle * a_Client) override
 		{
 			m_Entity->SpawnOn(*a_Client);
 		}
diff --git a/src/ChunkDataCallback.h b/src/ChunkDataCallback.h
index f9ff9915a..804299816 100644
--- a/src/ChunkDataCallback.h
+++ b/src/ChunkDataCallback.h
@@ -65,7 +65,7 @@ public:
 
 protected:
 
-	virtual void ChunkData(const cChunkData & a_BlockData) /*override*/
+	virtual void ChunkData(const cChunkData & a_BlockData) override
 	{
 		m_BlockData = a_BlockData.Copy();
 	}
@@ -87,7 +87,7 @@ public:
 
 protected:
 
-	virtual void ChunkData(const cChunkData & a_ChunkBuffer) /*override*/
+	virtual void ChunkData(const cChunkData & a_ChunkBuffer) override
 	{
 		a_ChunkBuffer.CopyBlockTypes(m_BlockData);
 		a_ChunkBuffer.CopyMetas(m_BlockData + cChunkDef::NumBlocks);
@@ -113,7 +113,7 @@ public:
 
 protected:
 
-	virtual void ChunkData(const cChunkData & a_ChunkBuffer) /*override*/
+	virtual void ChunkData(const cChunkData & a_ChunkBuffer) override
 	{
 		a_ChunkBuffer.CopyBlockTypes(m_BlockTypes);
 		a_ChunkBuffer.CopyMetas(m_BlockMetas);
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index f6373bc37..8c765c8c9 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1944,7 +1944,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
 		{
 		}
 
-		virtual bool Item(cEntity * a_Entity) /*override*/
+		virtual bool Item(cEntity * a_Entity) override
 		{
 			if (a_Entity->IsPickup() && (a_Entity->GetTicksAlive() < 20))
 			{
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index dd72e0b39..8c564d0de 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -416,15 +416,15 @@ private:
 	class cStarvationCallbacks
 		: public cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks
 	{
-		virtual void OnStartUsingReserve() /*override*/
+		virtual void OnStartUsingReserve() override
 		{
 			LOG("Using backup memory buffer");
 		}
-		virtual void OnEndUsingReserve() /*override*/
+		virtual void OnEndUsingReserve() override
 		{
 			LOG("Stoped using backup memory buffer");
 		}
-		virtual void OnOutOfReserve() /*override*/
+		virtual void OnOutOfReserve() override
 		{
 			LOG("Out of Memory");
 		}
diff --git a/src/ChunkSender.h b/src/ChunkSender.h
index 91ca28f05..a0e9087a9 100644
--- a/src/ChunkSender.h
+++ b/src/ChunkSender.h
@@ -51,7 +51,7 @@ class cChunkSender;
 class cNotifyChunkSender :
 	public cChunkCoordCallback
 {
-	virtual void Call(int a_ChunkX, int a_ChunkZ) /*override*/;
+	virtual void Call(int a_ChunkX, int a_ChunkZ) override;
 
 	cChunkSender * m_ChunkSender;
 public:
@@ -154,9 +154,9 @@ protected:
 	
 	// cChunkDataCollector overrides:
 	// (Note that they are called while the ChunkMap's CS is locked - don't do heavy calculations here!)
-	virtual void BiomeData    (const cChunkDef::BiomeMap * a_BiomeMap) /*override*/;
-	virtual void Entity       (cEntity *      a_Entity) /*override*/;
-	virtual void BlockEntity  (cBlockEntity * a_Entity) /*override*/;
+	virtual void BiomeData    (const cChunkDef::BiomeMap * a_BiomeMap) override;
+	virtual void Entity       (cEntity *      a_Entity) override;
+	virtual void BlockEntity  (cBlockEntity * a_Entity) override;
 
 	/// Sends the specified chunk to a_Client, or to all chunk clients if a_Client == NULL
 	void SendChunk(int a_ChunkX, int a_ChunkZ, cClientHandle * a_Client);
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 88dc15d04..6b31bfa64 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1627,7 +1627,7 @@ void cClientHandle::HandleUseEntity(int a_TargetEntityID, bool a_IsLeftClick)
 		class cRclkEntity : public cEntityCallback
 		{
 			cPlayer & m_Player;
-			virtual bool Item(cEntity * a_Entity) /*override*/
+			virtual bool Item(cEntity * a_Entity) override
 			{
 				if (cPluginManager::Get()->CallHookPlayerRightClickingEntity(m_Player, *a_Entity))
 				{
@@ -1648,7 +1648,7 @@ void cClientHandle::HandleUseEntity(int a_TargetEntityID, bool a_IsLeftClick)
 	// If it is a left click, attack the entity:
 	class cDamageEntity : public cEntityCallback
 	{
-		virtual bool Item(cEntity * a_Entity) /*override*/
+		virtual bool Item(cEntity * a_Entity) override
 		{
 			if (!a_Entity->GetWorld()->IsPVPEnabled())
 			{
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index f5ee357b3..593d0780d 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -415,10 +415,10 @@ private:
 	/** Handles the "MC|ItemName" plugin message */
 	void HandleAnvilItemName(const char * a_Data, size_t a_Length);
 	
-	// cSocketThreads::cCallback /*override*/s:
-	virtual bool DataReceived   (const char * a_Data, size_t a_Size) /*override*/;  // Data is received from the client
-	virtual void GetOutgoingData(AString & a_Data) /*override*/;  // Data can be sent to client
-	virtual void SocketClosed   (void) /*override*/;  // The socket has been closed for any reason
+	// cSocketThreads::cCallback overrides:
+	virtual bool DataReceived   (const char * a_Data, size_t a_Size) override;  // Data is received from the client
+	virtual void GetOutgoingData(AString & a_Data) override;  // Data can be sent to client
+	virtual void SocketClosed   (void) override;  // The socket has been closed for any reason
 };  // tolua_export
 
 
diff --git a/src/CommandOutput.h b/src/CommandOutput.h
index 391d5a868..daa9430c0 100644
--- a/src/CommandOutput.h
+++ b/src/CommandOutput.h
@@ -34,8 +34,8 @@ public:
 class cNullCommandOutputCallback :
 	public cCommandOutputCallback
 {
-	// cCommandOutputCallback /*override*/s:
-	virtual void Out(const AString & a_Text) /*override*/
+	// cCommandOutputCallback overrides:
+	virtual void Out(const AString & a_Text) override
 	{
 		// Do nothing
 		UNUSED(a_Text);
@@ -52,9 +52,9 @@ class cLogCommandOutputCallback :
 	public cCommandOutputCallback
 {
 public:
-	// cCommandOutputCallback /*override*/s:
-	virtual void Out(const AString & a_Text) /*override*/;
-	virtual void Finished(void) /*override*/;
+	// cCommandOutputCallback overrides:
+	virtual void Out(const AString & a_Text) override;
+	virtual void Finished(void) override;
 	
 protected:
 	/// Output is stored here until the command finishes processing
@@ -71,7 +71,7 @@ class cLogCommandDeleteSelfOutputCallback :
 {
 	typedef cLogCommandOutputCallback super;
 	
-	virtual void Finished(void) /*override*/
+	virtual void Finished(void) override
 	{
 		super::Finished();
 		delete this;
diff --git a/src/DeadlockDetect.cpp b/src/DeadlockDetect.cpp
index d8c1ffd34..7f703416c 100644
--- a/src/DeadlockDetect.cpp
+++ b/src/DeadlockDetect.cpp
@@ -44,7 +44,7 @@ bool cDeadlockDetect::Start(int a_IntervalSec)
 		{
 		}
 		
-		virtual bool Item(cWorld * a_World) /*override*/
+		virtual bool Item(cWorld * a_World) override
 		{
 			m_Detect->SetWorldAge(a_World->GetName(), a_World->GetWorldAge());
 			return false;
@@ -79,7 +79,7 @@ void cDeadlockDetect::Execute(void)
 		protected:
 			cDeadlockDetect * m_Detect;
 			
-			virtual bool Item(cWorld * a_World) /*override*/
+			virtual bool Item(cWorld * a_World) override
 			{
 				m_Detect->CheckWorldAge(a_World->GetName(), a_World->GetWorldAge());
 				return false;
diff --git a/src/DeadlockDetect.h b/src/DeadlockDetect.h
index e397dd997..6aa98acbb 100644
--- a/src/DeadlockDetect.h
+++ b/src/DeadlockDetect.h
@@ -50,8 +50,8 @@ protected:
 	int m_IntervalSec;
 	
 	
-	// cIsThread /*override*/s:
-	virtual void Execute(void) /*override*/;
+	// cIsThread overrides:
+	virtual void Execute(void) override;
 	
 	/// Sets the initial world age
 	void SetWorldAge(const AString & a_WorldName, Int64 a_Age);
diff --git a/src/Entities/ArrowEntity.h b/src/Entities/ArrowEntity.h
index 10d530a55..a1e7a17e7 100644
--- a/src/Entities/ArrowEntity.h
+++ b/src/Entities/ArrowEntity.h
@@ -94,10 +94,10 @@ protected:
 	/// Stores the block position that arrow is lodged into, sets m_IsInGround to false if it becomes air
 	Vector3i m_HitBlockPos;
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
-	virtual void CollectedBy(cPlayer * a_Player) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	virtual void CollectedBy(cPlayer * a_Player) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
 };  // tolua_export
diff --git a/src/Entities/Boat.h b/src/Entities/Boat.h
index 835adc889..8de88d165 100644
--- a/src/Entities/Boat.h
+++ b/src/Entities/Boat.h
@@ -23,12 +23,12 @@ class cBoat :
 public:
 	CLASS_PROTODEF(cBoat)
 		
-	// cEntity /*override*/s:
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
-	virtual bool DoTakeDamage(TakeDamageInfo & TDI) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) /*override*/;
+	// cEntity overrides:
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) override;
 	
 	cBoat(double a_X, double a_Y, double a_Z);
 } ;
diff --git a/src/Entities/EnderCrystal.h b/src/Entities/EnderCrystal.h
index f6024af86..c98c3b681 100644
--- a/src/Entities/EnderCrystal.h
+++ b/src/Entities/EnderCrystal.h
@@ -21,10 +21,10 @@ public:
 
 private:
 
-	// cEntity /*override*/s:
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	// cEntity overrides:
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 };  // tolua_export
 
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 4754eb92c..b9c280b6b 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -10,11 +10,11 @@
 
 // Place this macro in the public section of each cEntity descendant class and you're done :)
 #define CLASS_PROTODEF(classname) \
-	virtual bool IsA(const char * a_ClassName) const /*override*/\
+	virtual bool IsA(const char * a_ClassName) const override\
 	{ \
 		return ((strcmp(a_ClassName, #classname) == 0) || super::IsA(a_ClassName)); \
 	} \
-	virtual const char * GetClass(void) const /*override*/ \
+	virtual const char * GetClass(void) const override \
 	{ \
 		return #classname; \
 	} \
@@ -22,7 +22,7 @@
 	{ \
 		return #classname; \
 	} \
-	virtual const char * GetParentClass(void) const /*override*/ \
+	virtual const char * GetParentClass(void) const override \
 	{ \
 		return super::GetClass(); \
 	}
@@ -420,7 +420,7 @@ public:
 	
 	// tolua_begin
 	
-	// COMMON metadata flags; descendants may /*override*/ the defaults:
+	// COMMON metadata flags; descendants may override the defaults:
 	virtual bool IsOnFire   (void) const {return (m_TicksLeftBurning > 0); }
 	virtual bool IsCrouched (void) const {return false; }
 	virtual bool IsRiding   (void) const {return false; }
diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h
index 4ce155f4a..47c298f57 100644
--- a/src/Entities/EntityEffect.h
+++ b/src/Entities/EntityEffect.h
@@ -213,7 +213,7 @@ public:
 	{
 	}
 	
-	virtual void OnActivate(cPawn & a_Target) /*override*/;
+	virtual void OnActivate(cPawn & a_Target) override;
 };
 
 
@@ -230,7 +230,7 @@ public:
 	{
 	}
 	
-	virtual void OnActivate(cPawn & a_Target) /*override*/;
+	virtual void OnActivate(cPawn & a_Target) override;
 };
 
 
@@ -277,7 +277,7 @@ public:
 	{
 	}
 	
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -384,8 +384,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -402,8 +402,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -420,8 +420,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -438,8 +438,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -486,7 +486,7 @@ public:
 	{
 	}
 	
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
diff --git a/src/Entities/ExpBottleEntity.h b/src/Entities/ExpBottleEntity.h
index 95f10becd..d62a84469 100644
--- a/src/Entities/ExpBottleEntity.h
+++ b/src/Entities/ExpBottleEntity.h
@@ -27,7 +27,7 @@ public:
 	
 protected:
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
 	
 };  // tolua_export
diff --git a/src/Entities/ExpOrb.h b/src/Entities/ExpOrb.h
index eb18d95c5..bdb9a5b19 100644
--- a/src/Entities/ExpOrb.h
+++ b/src/Entities/ExpOrb.h
@@ -22,8 +22,8 @@ public:
 	cExpOrb(const Vector3d & a_Pos, int a_Reward);
 
 	// Override functions
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void SpawnOn(cClientHandle & a_Client) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SpawnOn(cClientHandle & a_Client) override;
 
 	/** Returns the number of ticks that this entity has existed */
 	int GetAge(void) const { return (int)(m_Timer / 50); }     // tolua_export
diff --git a/src/Entities/FallingBlock.h b/src/Entities/FallingBlock.h
index 58190e9e9..c20fe8eb9 100644
--- a/src/Entities/FallingBlock.h
+++ b/src/Entities/FallingBlock.h
@@ -28,9 +28,9 @@ public:
 	BLOCKTYPE  GetBlockType(void) const { return m_BlockType; }
 	NIBBLETYPE GetBlockMeta(void) const { return m_BlockMeta; }
 	
-	// cEntity /*override*/s:
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	// cEntity overrides:
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
 private:
 	BLOCKTYPE  m_BlockType;
diff --git a/src/Entities/FireChargeEntity.h b/src/Entities/FireChargeEntity.h
index 3dafe12c1..5df55bec4 100644
--- a/src/Entities/FireChargeEntity.h
+++ b/src/Entities/FireChargeEntity.h
@@ -29,8 +29,8 @@ protected:
 	
 	void Explode(int a_BlockX, int a_BlockY, int a_BlockZ);
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
 	
 } ;  // tolua_export
diff --git a/src/Entities/FireworkEntity.h b/src/Entities/FireworkEntity.h
index 70915f4d0..20f18b6dc 100644
--- a/src/Entities/FireworkEntity.h
+++ b/src/Entities/FireworkEntity.h
@@ -28,9 +28,9 @@ public:
 	
 protected:
 	
-	// cProjectileEntity /*override*/s:
-	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	// cProjectileEntity overrides:
+	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
 private:
 	
diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp
index 1a107d2f4..159429147 100644
--- a/src/Entities/Floater.cpp
+++ b/src/Entities/Floater.cpp
@@ -25,7 +25,7 @@ public:
 		m_HitEntity(NULL)
 	{
 	}
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		if (!a_Entity->IsMob())  // Floaters can only pull mobs not other entities.
 		{
@@ -86,7 +86,7 @@ public:
 	{
 	}
 
-	bool Item(cEntity * a_Entity) /*override*/
+	bool Item(cEntity * a_Entity) override
 	{
 		m_EntityExists = true;
 		return false;
diff --git a/src/Entities/Floater.h b/src/Entities/Floater.h
index 0bc231bb2..96d77ac82 100644
--- a/src/Entities/Floater.h
+++ b/src/Entities/Floater.h
@@ -20,8 +20,8 @@ public:
 
 	cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime);
 
-	virtual void SpawnOn(cClientHandle & a_Client) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void SpawnOn(cClientHandle & a_Client) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
 	// tolua_begin
 	bool CanPickup(void)       const { return m_CanPickupItem; }
diff --git a/src/Entities/GhastFireballEntity.h b/src/Entities/GhastFireballEntity.h
index 35f5136dd..3ed72d9ef 100644
--- a/src/Entities/GhastFireballEntity.h
+++ b/src/Entities/GhastFireballEntity.h
@@ -29,9 +29,9 @@ protected:
 	
 	void Explode(int a_BlockX, int a_BlockY, int a_BlockZ);
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
 	
 	// TODO: Deflecting the fireballs by arrow- or sword- hits
 	
diff --git a/src/Entities/HangingEntity.h b/src/Entities/HangingEntity.h
index 44c9d29c3..3593f9ede 100644
--- a/src/Entities/HangingEntity.h
+++ b/src/Entities/HangingEntity.h
@@ -37,8 +37,8 @@ public:
 
 private:
 
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/ {}
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override {}
 
 	eBlockFace m_BlockFace;
 
diff --git a/src/Entities/ItemFrame.h b/src/Entities/ItemFrame.h
index 09652bf84..a63b78b70 100644
--- a/src/Entities/ItemFrame.h
+++ b/src/Entities/ItemFrame.h
@@ -34,9 +34,9 @@ public:
 
 private:
 
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
-	virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) /*override*/;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
+	virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override;
 
 	cItem m_Item;
 	Byte m_Rotation;
diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index d1f56867d..1501eea84 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -2,7 +2,7 @@
 // Minecart.cpp
 
 // Implements the cMinecart class representing a minecart in the world
-// Handles physics when a minecart is on any type of rail (/*override*/s simulator in Entity.cpp)
+// Handles physics when a minecart is on any type of rail (overrides simulator in Entity.cpp)
 // Indiana Jones!
 
 #include "Globals.h"
@@ -34,7 +34,7 @@ public:
 	{
 	}
 
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		ASSERT(a_Entity != NULL);
 
@@ -177,7 +177,7 @@ void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 	else
 	{
 		// Not on rail, default physics
-		SetPosY(floor(GetPosY()) + 0.35);  // HandlePhysics /*override*/s this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail
+		SetPosY(floor(GetPosY()) + 0.35);  // HandlePhysics overrides this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail
 		super::HandlePhysics(a_Dt, *Chunk);
 	}
 
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index b9779f531..410d3c77d 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -34,11 +34,11 @@ public:
 		// TODO: Spawner minecarts, (and possibly any block in a minecart with NBT editing)
 	} ;
 	
-	// cEntity /*override*/s:
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
-	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual bool DoTakeDamage(TakeDamageInfo & TDI) /*override*/;
-	virtual void Destroyed() /*override*/;
+	// cEntity overrides:
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+	virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;
+	virtual void Destroyed() override;
 	
 	int LastDamage(void) const { return m_LastDamage; }
 	ePayload GetPayload(void) const { return m_Payload; }
@@ -95,8 +95,8 @@ public:
 
 	const cItem & GetContent(void) const {return m_Content;}
 	int GetBlockHeight(void) const {return m_Height;}
-	// cEntity /*override*/s:
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
+	// cEntity overrides:
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 protected:
 
 	cItem m_Content;
@@ -130,8 +130,8 @@ protected:
 	/// The chest contents:
 	cItem m_Items[NumSlots];
 	
-	// cEntity /*override*/s:
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
+	// cEntity overrides:
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 } ;
 
 
@@ -148,9 +148,9 @@ public:
 	
 	cMinecartWithFurnace(double a_X, double a_Y, double a_Z);
 	
-	// cEntity /*override*/s:
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	// cEntity overrides:
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	// Set functions.
 	void SetIsFueled(bool a_IsFueled, int a_FueledTimeLeft = -1) {m_IsFueled = a_IsFueled; m_FueledTimeLeft = a_FueledTimeLeft;}
diff --git a/src/Entities/Painting.h b/src/Entities/Painting.h
index 3bb4b0bbf..9877c95c5 100644
--- a/src/Entities/Painting.h
+++ b/src/Entities/Painting.h
@@ -23,10 +23,10 @@ public:
 
 private:
 
-	virtual void SpawnOn(cClientHandle & a_Client) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/
+	virtual void SpawnOn(cClientHandle & a_Client) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override
 	{
 		super::KilledBy(a_TDI);
 		Destroy();
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h
index 120b44ed4..d50bcd8af 100644
--- a/src/Entities/Pawn.h
+++ b/src/Entities/Pawn.h
@@ -20,8 +20,8 @@ public:
 
 	cPawn(eEntityType a_EntityType, double a_Width, double a_Height);
 	
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 	
 	// tolua_begin
 	
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index 20d0f2c6e..87b5bed07 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -28,7 +28,7 @@ public:
 	{
 	}
 
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		if (!a_Entity->IsPickup() || (a_Entity->GetUniqueID() <= m_Pickup->GetUniqueID()) || a_Entity->IsDestroyed())
 		{
diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h
index 5b2986c92..4d5250819 100644
--- a/src/Entities/Pickup.h
+++ b/src/Entities/Pickup.h
@@ -30,11 +30,11 @@ public:
 	cItem &       GetItem(void)       {return m_Item; }  // tolua_export
 	const cItem & GetItem(void) const {return m_Item; }
 
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
 	bool CollectedBy(cPlayer * a_Dest);  // tolua_export
 
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	/** Returns the number of ticks that this entity has existed */
 	int GetAge(void) const { return (int)(m_Timer / 50); }     // tolua_export
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index ee06b49e9..756410989 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1911,7 +1911,7 @@ void cPlayer::HandleFloater()
 		public cEntityCallback
 	{
 	public:
-		virtual bool Item(cEntity * a_Entity) /*override*/
+		virtual bool Item(cEntity * a_Entity) override
 		{
 			a_Entity->Destroy(true);
 			return true;
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 9bcb0c2ef..9821cc6d9 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -44,26 +44,26 @@ public:
 	
 	virtual ~cPlayer();
 
-	virtual void SpawnOn(cClientHandle & a_Client) /*override*/;
+	virtual void SpawnOn(cClientHandle & a_Client) override;
 	
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
-	virtual void HandlePhysics(float a_Dt, cChunk &) /*override*/ { UNUSED(a_Dt); }
+	virtual void HandlePhysics(float a_Dt, cChunk &) override { UNUSED(a_Dt); }
 
 	/** Returns the curently equipped weapon; empty item if none */
-	virtual cItem GetEquippedWeapon(void) const /*override*/ { return m_Inventory.GetEquippedItem(); }
+	virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); }
 	
 	/** Returns the currently equipped helmet; empty item if none */
-	virtual cItem GetEquippedHelmet(void) const /*override*/ { return m_Inventory.GetEquippedHelmet(); }
+	virtual cItem GetEquippedHelmet(void) const override { return m_Inventory.GetEquippedHelmet(); }
 	
 	/** Returns the currently equipped chestplate; empty item if none */
-	virtual cItem GetEquippedChestplate(void) const /*override*/ { return m_Inventory.GetEquippedChestplate(); }
+	virtual cItem GetEquippedChestplate(void) const override { return m_Inventory.GetEquippedChestplate(); }
 
 	/** Returns the currently equipped leggings; empty item if none */
-	virtual cItem GetEquippedLeggings(void) const /*override*/ { return m_Inventory.GetEquippedLeggings(); }
+	virtual cItem GetEquippedLeggings(void) const override { return m_Inventory.GetEquippedLeggings(); }
 	
 	/** Returns the currently equipped boots; empty item if none */
-	virtual cItem GetEquippedBoots(void) const /*override*/ { return m_Inventory.GetEquippedBoots(); }
+	virtual cItem GetEquippedBoots(void) const override { return m_Inventory.GetEquippedBoots(); }
 
 
 	// tolua_begin
@@ -134,7 +134,7 @@ public:
 	/** Returns whether the player is climbing (ladders, vines etc.) */
 	bool IsClimbing(void) const;
 
-	virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) /*override*/;
+	virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override;
 
 	// tolua_begin
 	
@@ -261,7 +261,7 @@ public:
 	void TossPickup(const cItem & a_Item);
 
 	/** Heals the player by the specified amount of HPs (positive only); sends health update */
-	virtual void Heal(int a_Health) /*override*/;
+	virtual void Heal(int a_Health) override;
 	
 	int    GetFoodLevel                 (void) const { return m_FoodLevel; }
 	double GetFoodSaturationLevel       (void) const { return m_FoodSaturationLevel; }
@@ -312,9 +312,9 @@ public:
 	/** Aborts the current eating operation */
 	void AbortEating(void);
 	
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
-	virtual void Killed(cEntity * a_Victim) /*override*/;
+	virtual void Killed(cEntity * a_Victim) override;
 
 	void Respawn(void);  // tolua_export
 
@@ -323,7 +323,7 @@ public:
 
 	/** Moves the player to the specified world.
 	Returns true if successful, false on failure (world not found). */
-	virtual bool DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) /*override*/;
+	virtual bool DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) override;
 
 	/** Saves all player data, such as inventory, to JSON */
 	bool SaveToDisk(void);
@@ -422,7 +422,7 @@ public:
 
 	// tolua_end
 
-	// cEntity /*override*/s:
+	// cEntity overrides:
 	virtual bool IsCrouched (void) const { return m_IsCrouched; }
 	virtual bool IsSprinting(void) const { return m_IsSprinting; }
 	virtual bool IsRclking  (void) const { return IsEating() || IsChargingBow(); }
@@ -563,7 +563,7 @@ protected:
 	AString m_UUID;
 
 	/** Sets the speed and sends it to the client, so that they are forced to move so. */
-	virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) /*override*/;
+	virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override;
 
 	void ResolvePermissions(void);
 	void ResolveGroups(void);
@@ -571,10 +571,10 @@ protected:
 	virtual void Destroyed(void);
 
 	/** Filters out damage for creative mode/friendly fire */
-	virtual bool DoTakeDamage(TakeDamageInfo & TDI) /*override*/;
+	virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;
 
 	/** Stops players from burning in creative mode */
-	virtual void TickBurning(cChunk & a_Chunk) /*override*/;
+	virtual void TickBurning(cChunk & a_Chunk) override;
 	
 	/** Called in each tick to handle food-related processing */
 	void HandleFood(void);
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 6356ab036..acc9bd674 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -55,8 +55,8 @@ protected:
 	cProjectileEntity * m_Projectile;
 	double m_SlowdownCoeff;
 	
-	// cCallbacks /*override*/s:
-	virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/
+	// cCallbacks overrides:
+	virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
 	{
 		/*
 		// DEBUG:
@@ -140,7 +140,7 @@ public:
 	}
 	
 	
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		if (
 			(a_Entity == m_Projectile) ||          // Do not check collisions with self
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index 46b61d097..990136a32 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -117,9 +117,9 @@ protected:
 	/// True if the projectile has hit the ground and is stuck there
 	bool m_IsInGround;
 		
-	// cEntity /*override*/s:
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void SpawnOn(cClientHandle & a_Client) /*override*/;
+	// cEntity overrides:
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SpawnOn(cClientHandle & a_Client) override;
 	
 } ;  // tolua_export
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index 73addfc85..fd1a0179b 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -31,7 +31,7 @@ public:
 	}
 	
 	/** Called by cWorld::ForEachEntity(), adds the stored entity effect to the entity, if it is close enough. */
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		if (!a_Entity->IsPawn())
 		{
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h
index 97e847b2c..4afc5f204 100644
--- a/src/Entities/SplashPotionEntity.h
+++ b/src/Entities/SplashPotionEntity.h
@@ -47,10 +47,10 @@ protected:
 	int m_PotionColor;
 	
 
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
-	virtual void Tick           (float a_Dt, cChunk & a_Chunk) /*override*/
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	virtual void Tick           (float a_Dt, cChunk & a_Chunk) override
 	{
 		if (m_DestroyTimer > 0)
 		{
@@ -71,7 +71,7 @@ protected:
 	@param a_HitPos     The position where the potion will splash */
 	void Splash(const Vector3d & a_HitPos);
 	
-	virtual void SpawnOn(cClientHandle & a_Client) /*override*/;
+	virtual void SpawnOn(cClientHandle & a_Client) override;
 
 private:
 	/** Time in ticks to wait for the hit animation to begin before destroying */
diff --git a/src/Entities/TNTEntity.h b/src/Entities/TNTEntity.h
index a51307484..48503cf76 100644
--- a/src/Entities/TNTEntity.h
+++ b/src/Entities/TNTEntity.h
@@ -19,9 +19,9 @@ public:
 	cTNTEntity(double a_X, double a_Y, double a_Z, int a_FuseTicks = 80);
 	cTNTEntity(const Vector3d & a_Pos, int a_FuseTicks = 80);
 	
-	// cEntity /*override*/s:
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	// cEntity overrides:
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
 	// tolua_begin
 	
diff --git a/src/Entities/ThrownEggEntity.h b/src/Entities/ThrownEggEntity.h
index 187a05eab..a0b7d5340 100644
--- a/src/Entities/ThrownEggEntity.h
+++ b/src/Entities/ThrownEggEntity.h
@@ -27,10 +27,10 @@ public:
 	
 protected:
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
-	virtual void Tick           (float a_Dt, cChunk & a_Chunk) /*override*/
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	virtual void Tick           (float a_Dt, cChunk & a_Chunk) override
 	{
 		if (m_DestroyTimer > 0)
 		{
diff --git a/src/Entities/ThrownEnderPearlEntity.cpp b/src/Entities/ThrownEnderPearlEntity.cpp
index 8209e0f47..c7407e6ae 100644
--- a/src/Entities/ThrownEnderPearlEntity.cpp
+++ b/src/Entities/ThrownEnderPearlEntity.cpp
@@ -61,7 +61,7 @@ void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos)
 		{
 		}
 
-		virtual bool Item(cPlayer * a_Entity) /*override*/
+		virtual bool Item(cPlayer * a_Entity) override
 		{
 			// Teleport the creator here, make them take 5 damage:
 			a_Entity->TeleportToCoords(m_HitPos.x, m_HitPos.y + 0.2, m_HitPos.z);
diff --git a/src/Entities/ThrownEnderPearlEntity.h b/src/Entities/ThrownEnderPearlEntity.h
index 88a02a90e..436450013 100644
--- a/src/Entities/ThrownEnderPearlEntity.h
+++ b/src/Entities/ThrownEnderPearlEntity.h
@@ -27,10 +27,10 @@ public:
 	
 protected:
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
-	virtual void Tick           (float a_Dt, cChunk & a_Chunk) /*override*/
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	virtual void Tick           (float a_Dt, cChunk & a_Chunk) override
 	{
 		if (m_DestroyTimer > 0)
 		{
diff --git a/src/Entities/ThrownSnowballEntity.h b/src/Entities/ThrownSnowballEntity.h
index 811ea4ff1..8d195ced1 100644
--- a/src/Entities/ThrownSnowballEntity.h
+++ b/src/Entities/ThrownSnowballEntity.h
@@ -27,10 +27,10 @@ public:
 	
 protected:
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
-	virtual void Tick           (float a_Dt, cChunk & a_Chunk) /*override*/
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	virtual void Tick           (float a_Dt, cChunk & a_Chunk) override
 	{
 		if (m_DestroyTimer > 0)
 		{
diff --git a/src/Entities/WitherSkullEntity.h b/src/Entities/WitherSkullEntity.h
index a9e0cd575..c59acd807 100644
--- a/src/Entities/WitherSkullEntity.h
+++ b/src/Entities/WitherSkullEntity.h
@@ -28,8 +28,8 @@ public:
 	
 protected:
 	
-	// cProjectileEntity /*override*/s:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/;
-	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/;
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
 	
 } ;  // tolua_export
diff --git a/src/Generating/BioGen.h b/src/Generating/BioGen.h
index f6946a5a8..a4cf95a72 100644
--- a/src/Generating/BioGen.h
+++ b/src/Generating/BioGen.h
@@ -32,9 +32,9 @@ protected:
 
 	EMCSBiome m_Biome;
 
-	// cBiomeGen /*override*/s:
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	// cBiomeGen overrides:
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -72,8 +72,8 @@ protected:
 	int m_NumMisses;
 	int m_TotalChain;  // Number of cache items walked to get to a hit (only added for hits)
 	
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -134,9 +134,9 @@ class cBioGenCheckerboard :
 protected:
 	int m_BiomeSize;
 	
-	// cBiomeGen /*override*/s:
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	// cBiomeGen overrides:
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -157,9 +157,9 @@ public:
 protected:
 	cVoronoiMap m_Voronoi;
 	
-	// cBiomeGen /*override*/s:
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	// cBiomeGen overrides:
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 	
 	EMCSBiome VoronoiBiome(int a_BlockX, int a_BlockZ);
 } ;
@@ -191,9 +191,9 @@ protected:
 	/// Size of the Voronoi cells, also used for distortion amplitude
 	int m_CellSize;
 	
-	// cBiomeGen /*override*/s:
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	// cBiomeGen overrides:
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 	
 	/// Distorts the coords using a Perlin-like noise
 	void Distort(int a_BlockX, int a_BlockZ, int & a_DistortedX, int & a_DistortedZ);
@@ -230,9 +230,9 @@ protected:
 	typedef int    IntMap[17 * 17];  // x + 17 * z, expected trimmed into [0..255] range
 	typedef double DblMap[17 * 17];  // x + 17 * z, expected trimmed into [0..1] range
 		
-	// cBiomeGen /*override*/s:
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	// cBiomeGen overrides:
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 	
 	/** Step 1: Decides between ocean, land and mushroom, using a DistVoronoi with special conditions and post-processing for mushroom islands
 	Sets biomes to biOcean, -1 (i.e. land), biMushroomIsland or biMushroomShore
@@ -295,9 +295,9 @@ protected:
 	cNoise m_Noise6;
 
 
-	// cBiomeGen /*override*/s:
-	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void InitializeBiomeGen(cIniFile & a_IniFile) /*override*/;
+	// cBiomeGen overrides:
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void InitializeBiomeGen(cIniFile & a_IniFile) override;
 
 	/// Selects biome from the specified biome group, based on the specified index.
 	/// Note that both params may overflow
diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 13fe2d3ed..71154dff9 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -143,8 +143,8 @@ protected:
 	/// Returns a radius based on the location provided.
 	int GetRadius(cNoise & a_Noise, int a_OriginX, int a_OriginY, int a_OriginZ);
 
-	// cGridStructGen::cStructure /*override*/s:
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cGridStructGen::cStructure overrides:
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
diff --git a/src/Generating/Caves.h b/src/Generating/Caves.h
index 4783a6ff9..0e17acf9e 100644
--- a/src/Generating/Caves.h
+++ b/src/Generating/Caves.h
@@ -29,8 +29,8 @@ protected:
 
 	int m_Seed;
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -55,8 +55,8 @@ protected:
 	int    m_Seed;
 	float  m_Threshold;
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -85,8 +85,8 @@ protected:
 	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
 
-	// cGridStructGen /*override*/:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen override:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h
index 07711eef2..a8820853f 100644
--- a/src/Generating/ChunkGenerator.h
+++ b/src/Generating/ChunkGenerator.h
@@ -151,8 +151,8 @@ private:
 	cChunkSink * m_ChunkSink;
 	
 
-	// cIsThread /*override*/:
-	virtual void Execute(void) /*override*/;
+	// cIsThread override:
+	virtual void Execute(void) override;
 
 	void DoGenerate(int a_ChunkX, int a_ChunkZ);
 };
diff --git a/src/Generating/CompoGen.h b/src/Generating/CompoGen.h
index b2de70d5b..096b0fb5a 100644
--- a/src/Generating/CompoGen.h
+++ b/src/Generating/CompoGen.h
@@ -37,9 +37,9 @@ protected:
 	BLOCKTYPE m_BlockType;
 	bool      m_IsBedrocked;
 	
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -54,8 +54,8 @@ public:
 	
 protected:
 	
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -80,9 +80,9 @@ protected:
 	BLOCKTYPE m_BlockBeachBottom;
 	BLOCKTYPE m_BlockSea;
 	
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -104,9 +104,9 @@ protected:
 	cNoise m_Noise;
 	int    m_SeaLevel;
 	
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 	
 	void FillColumnGrass    (int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes);
 	void FillColumnClay     (int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes);
@@ -135,9 +135,9 @@ protected:
 	
 	int m_Threshold;
 	
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -152,9 +152,9 @@ public:
 	cCompoGenCache(cTerrainCompositionGen & a_Underlying, int a_CacheSize);  // Doesn't take ownership of a_Underlying
 	~cCompoGenCache();
 	
-	// cTerrainCompositionGen /*override*/:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen override:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 	
 protected:
 
diff --git a/src/Generating/ComposableGenerator.h b/src/Generating/ComposableGenerator.h
index 8cd209059..6b7627d2e 100644
--- a/src/Generating/ComposableGenerator.h
+++ b/src/Generating/ComposableGenerator.h
@@ -146,9 +146,9 @@ public:
 	cComposableGenerator(cChunkGenerator & a_ChunkGenerator);
 	virtual ~cComposableGenerator();
 	
-	virtual void Initialize(cIniFile & a_IniFile) /*override*/;
-	virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void Initialize(cIniFile & a_IniFile) override;
+	virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) override;
 
 protected:
 	// The generation composition:
diff --git a/src/Generating/DistortedHeightmap.h b/src/Generating/DistortedHeightmap.h
index 8ae272012..e6b3c9d3f 100644
--- a/src/Generating/DistortedHeightmap.h
+++ b/src/Generating/DistortedHeightmap.h
@@ -126,11 +126,11 @@ protected:
 	const sBlockInfo * ChooseOceanFloorPattern(int a_RelX, int a_RelZ);
 	
 	
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
 
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 } ;
diff --git a/src/Generating/EndGen.h b/src/Generating/EndGen.h
index 5bcedbde3..322061810 100644
--- a/src/Generating/EndGen.h
+++ b/src/Generating/EndGen.h
@@ -59,10 +59,10 @@ protected:
 	/// Returns true if the chunk is outside of the island's dimensions
 	bool IsChunkOutsideRange(int a_ChunkX, int a_ChunkZ);
 		
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
 
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
-	virtual void InitializeCompoGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
+	virtual void InitializeCompoGen(cIniFile & a_IniFile) override;
 } ;
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index 314f9e1f0..4a08d70c8 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -27,8 +27,8 @@ class cFinishGenSnow :
 	public cFinishGen
 {
 protected:
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -39,8 +39,8 @@ class cFinishGenIce :
 	public cFinishGen
 {
 protected:
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -62,7 +62,7 @@ protected:
 	int    m_Seed;
 
 	void TryPlaceClump(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block);
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -79,8 +79,8 @@ protected:
 	cNoise m_Noise;
 	int m_Seed;
 
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 
 	int GetBiomeDensity(EMCSBiome a_Biome)
 	{
@@ -130,8 +130,8 @@ protected:
 	/// Tries to place sugarcane at the coords specified, returns true if successful
 	bool TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ);
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -207,8 +207,8 @@ protected:
 	}
 
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -228,8 +228,8 @@ public:
 protected:
 	int m_Level;
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -265,8 +265,8 @@ protected:
 		BLOCKTYPE a_StationaryFluid
 	);
 
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -286,8 +286,8 @@ protected:
 	BLOCKTYPE      m_Fluid;
 	int            m_Chance;  ///< Chance, [0..100], that a spring will be generated in a chunk
 
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 
 	/// Tries to place a spring at the specified coords, checks neighbors. Returns true if successful
 	bool TryPlaceSpring(cChunkDesc & a_ChunkDesc, int x, int y, int z);
diff --git a/src/Generating/GridStructGen.cpp b/src/Generating/GridStructGen.cpp
index f8ea94900..7090f14b1 100644
--- a/src/Generating/GridStructGen.cpp
+++ b/src/Generating/GridStructGen.cpp
@@ -27,7 +27,7 @@ public:
 	}
 	
 protected:
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override
 	{
 		// Do nothing
 	}
diff --git a/src/Generating/GridStructGen.h b/src/Generating/GridStructGen.h
index e731319f0..03131fce9 100644
--- a/src/Generating/GridStructGen.h
+++ b/src/Generating/GridStructGen.h
@@ -131,10 +131,10 @@ protected:
 	around their gridpoint intersects the chunk. */
 	void GetStructuresForChunk(int a_ChunkX, int a_ChunkZ, cStructurePtrs & a_Structures);
 
-	// cFinishGen /*override*/s:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen overrides:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 	
-	// Functions for the descendants to /*override*/:
+	// Functions for the descendants to override:
 	/** Create a new structure at the specified gridpoint */
 	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) = 0;
 } ;
diff --git a/src/Generating/HeiGen.h b/src/Generating/HeiGen.h
index 35c8fd1b1..5c106c7d9 100644
--- a/src/Generating/HeiGen.h
+++ b/src/Generating/HeiGen.h
@@ -31,9 +31,9 @@ protected:
 
 	int m_Height;
 
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -48,9 +48,9 @@ public:
 	cHeiGenCache(cTerrainHeightGen & a_HeiGenToCache, int a_CacheSize);  // Doesn't take ownership of a_HeiGenToCache
 	~cHeiGenCache();
 	
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
 	
 	/// Retrieves height at the specified point in the cache, returns true if found, false if not found
 	bool GetHeightAt(int a_ChunkX, int a_ChunkZ, int a_RelX, int a_RelZ, HEIGHTTYPE & a_Height);
@@ -97,9 +97,9 @@ protected:
 	
 	float GetNoise(float x, float y);
 
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -118,9 +118,9 @@ protected:
 	cRidgedMultiNoise m_Noise;
 	cPerlinNoise m_Perlin;
 	
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
 } ;
 
 
@@ -154,9 +154,9 @@ protected:
 	} ;
 	static const sGenParam m_GenParam[256];
 	
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
-	virtual void InitializeHeightGen(cIniFile & a_IniFile) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
+	virtual void InitializeHeightGen(cIniFile & a_IniFile) override;
 	
 	NOISE_DATATYPE GetHeightAt(int a_RelX, int a_RelZ, int a_ChunkX, int a_ChunkZ, const BiomeNeighbors & a_BiomeNeighbors);
 } ;
diff --git a/src/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp
index d70233248..0532aff39 100644
--- a/src/Generating/MineShafts.cpp
+++ b/src/Generating/MineShafts.cpp
@@ -95,9 +95,9 @@ class cMineShaftDirtRoom :
 public:
 	cMineShaftDirtRoom(cStructGenMineShafts::cMineShaftSystem & a_Parent, cNoise & a_Noise);
 
-	// cMineShaft /*override*/s:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cMineShaft overrides:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -136,9 +136,9 @@ protected:
 		cNoise & a_Noise
 	);
 
-	// cMineShaft /*override*/s:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cMineShaft overrides:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
 
 	/// Places a chest, if the corridor has one
 	void PlaceChest(cChunkDesc & a_ChunkDesc);
@@ -176,9 +176,9 @@ public:
 protected:
 	cMineShaftCrossing(cStructGenMineShafts::cMineShaftSystem & a_ParentSystem, const cCuboid & a_BoundingBox);
 
-	// cMineShaft /*override*/s:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cMineShaft overrides:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -219,9 +219,9 @@ protected:
 		eSlope a_Slope
 	);
 
-	// cMineShaft /*override*/s:
-	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) /*override*/;
-	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cMineShaft overrides:
+	virtual void AppendBranches(int a_RecursionLevel, cNoise & a_Noise) override;
+	virtual void ProcessChunk(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -267,7 +267,7 @@ public:
 	/** Returns true if none of the objects in m_MineShafts intersect with the specified bounding box and the bounding box is valid */
 	bool CanAppend(const cCuboid & a_BoundingBox);
 
-	// cGridStructGen::cStructure /*override*/s:
+	// cGridStructGen::cStructure overrides:
 	virtual void DrawIntoChunk(cChunkDesc & a_Chunk);
 } ;
 
diff --git a/src/Generating/MineShafts.h b/src/Generating/MineShafts.h
index 610dbab87..2850db571 100644
--- a/src/Generating/MineShafts.h
+++ b/src/Generating/MineShafts.h
@@ -42,8 +42,8 @@ protected:
 	int    m_ProbLevelCrossing;   ///< Probability level of a branch object being the crossing, minus Corridor
 	int    m_ProbLevelStaircase;  ///< Probability level of a branch object being the staircase, minus Crossing
 	
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/NetherFortGen.h b/src/Generating/NetherFortGen.h
index 965f50059..9b31aa0e2 100644
--- a/src/Generating/NetherFortGen.h
+++ b/src/Generating/NetherFortGen.h
@@ -36,8 +36,8 @@ protected:
 	static cPrefabPiecePool m_PiecePool;
 	
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h
index e06d1587f..42f61a854 100644
--- a/src/Generating/Noise3DGenerator.h
+++ b/src/Generating/Noise3DGenerator.h
@@ -24,9 +24,9 @@ public:
 	cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator);
 	virtual ~cNoise3DGenerator();
 	
-	virtual void Initialize(cIniFile & a_IniFile) /*override*/;
-	virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) /*override*/;
-	virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) /*override*/;
+	virtual void Initialize(cIniFile & a_IniFile) override;
+	virtual void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) override;
+	virtual void DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) override;
 	
 protected:
 	// Linear interpolation step sizes, must be divisors of cChunkDef::Width and cChunkDef::Height, respectively:
@@ -94,11 +94,11 @@ protected:
 	/// Generates the 3D noise array used for terrain generation, unless the LastChunk coords are equal to coords given
 	void GenerateNoiseArrayIfNeeded(int a_ChunkX, int a_ChunkZ);
 	
-	// cTerrainHeightGen /*override*/s:
-	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) /*override*/;
+	// cTerrainHeightGen overrides:
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) override;
 
-	// cTerrainCompositionGen /*override*/s:
-	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cTerrainCompositionGen overrides:
+	virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
diff --git a/src/Generating/POCPieceGenerator.cpp b/src/Generating/POCPieceGenerator.cpp
index cfd8ed9bd..6e7e74d7a 100644
--- a/src/Generating/POCPieceGenerator.cpp
+++ b/src/Generating/POCPieceGenerator.cpp
@@ -105,23 +105,23 @@ protected:
 	int m_Height;
 	cConnectors m_Connectors;
 	
-	// cPiece /*override*/s:
-	virtual cConnectors GetConnectors(void) const /*override*/
+	// cPiece overrides:
+	virtual cConnectors GetConnectors(void) const override
 	{
 		return m_Connectors;
 	}
 	
-	virtual Vector3i GetSize(void) const /*override*/
+	virtual Vector3i GetSize(void) const override
 	{
 		return Vector3i(m_SizeXZ, m_Height, m_SizeXZ);
 	}
 	
-	virtual cCuboid GetHitBox(void) const /*override*/
+	virtual cCuboid GetHitBox(void) const override
 	{
 		return cCuboid(0, 0, 0, m_SizeXZ - 1, m_Height - 1, m_SizeXZ - 1);
 	}
 	
-	virtual bool CanRotateCCW(int a_NumRotations) const /*override*/
+	virtual bool CanRotateCCW(int a_NumRotations) const override
 	{
 		return true;
 	}
diff --git a/src/Generating/POCPieceGenerator.h b/src/Generating/POCPieceGenerator.h
index b353d2e16..de3114ce0 100644
--- a/src/Generating/POCPieceGenerator.h
+++ b/src/Generating/POCPieceGenerator.h
@@ -38,14 +38,14 @@ protected:
 	cCuboid m_Bounds;
 
 
-	// cFinishGen /*override*/s:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen overrides:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 	
-	// cPiecePool /*override*/s:
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/;
-	virtual cPieces GetStartingPieces(void) /*override*/;
-	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/;
-	virtual void Reset(void) /*override*/;
+	// cPiecePool overrides:
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override;
+	virtual cPieces GetStartingPieces(void) override;
+	virtual void PiecePlaced(const cPiece & a_Piece) override;
+	virtual void Reset(void) override;
 } ;
 
 
diff --git a/src/Generating/PieceGenerator.cpp b/src/Generating/PieceGenerator.cpp
index 54c71cf70..ae4b6e36c 100644
--- a/src/Generating/PieceGenerator.cpp
+++ b/src/Generating/PieceGenerator.cpp
@@ -73,7 +73,7 @@ protected:
 		{
 		}
 		
-		virtual cConnectors GetConnectors(void) const /*override*/
+		virtual cConnectors GetConnectors(void) const override
 		{
 			// Each piece has 4 connectors, one of each type, plus one extra, at the center of its walls:
 			cConnectors res;
@@ -84,17 +84,17 @@ protected:
 			return res;
 		}
 		
-		virtual Vector3i GetSize(void) const /*override*/
+		virtual Vector3i GetSize(void) const override
 		{
 			return Vector3i(m_Size, 5, m_Size);
 		}
 		
-		virtual cCuboid GetHitBox(void) const /*override*/
+		virtual cCuboid GetHitBox(void) const override
 		{
 			return cCuboid(0, 0, 0, m_Size - 1, 4, m_Size - 1);
 		}
 		
-		virtual bool CanRotateCCW(int a_NumCCWRotations) const /*override*/
+		virtual bool CanRotateCCW(int a_NumCCWRotations) const override
 		{
 			return true;
 		}
@@ -102,26 +102,26 @@ protected:
 	
 	cPieces m_Pieces;
 	
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override
 	{
 		// Each piece contains each connector
 		return m_Pieces;
 	}
 	
 	
-	virtual cPieces GetStartingPieces(void) /*override*/
+	virtual cPieces GetStartingPieces(void) override
 	{
 		return m_Pieces;
 	}
 	
 	
-	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/
+	virtual void PiecePlaced(const cPiece & a_Piece) override
 	{
 		UNUSED(a_Piece);
 	}
 	
 	
-	virtual void Reset(void) /*override*/
+	virtual void Reset(void) override
 	{
 	}
 	
diff --git a/src/Generating/Prefab.h b/src/Generating/Prefab.h
index 11e27bd6b..eb905e78e 100644
--- a/src/Generating/Prefab.h
+++ b/src/Generating/Prefab.h
@@ -183,11 +183,11 @@ protected:
 	bool m_MoveToGround;
 	
 	
-	// cPiece /*override*/s:
-	virtual cConnectors GetConnectors(void) const /*override*/;
-	virtual Vector3i GetSize(void) const /*override*/;
-	virtual cCuboid GetHitBox(void) const /*override*/;
-	virtual bool CanRotateCCW(int a_NumRotations) const /*override*/;
+	// cPiece overrides:
+	virtual cConnectors GetConnectors(void) const override;
+	virtual Vector3i GetSize(void) const override;
+	virtual cCuboid GetHitBox(void) const override;
+	virtual bool CanRotateCCW(int a_NumRotations) const override;
 	
 	/** Based on the m_AllowedRotations, adds rotated cBlockAreas to the m_BlockArea array.
 	To be called only from this class's constructor! */
diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h
index df5db3cd2..b9c1f0483 100644
--- a/src/Generating/PrefabPiecePool.h
+++ b/src/Generating/PrefabPiecePool.h
@@ -71,13 +71,13 @@ protected:
 	/** Adds the prefab to the m_PiecesByConnector map for all its connectors. */
 	void AddToPerConnectorMap(cPrefab * a_Prefab);
 	
-	// cPiecePool /*override*/s:
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/;
-	virtual cPieces GetStartingPieces(void) /*override*/;
-	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) /*override*/;
-	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) /*override*/;
-	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/;
-	virtual void Reset(void) /*override*/;
+	// cPiecePool overrides:
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override;
+	virtual cPieces GetStartingPieces(void) override;
+	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) override;
+	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) override;
+	virtual void PiecePlaced(const cPiece & a_Piece) override;
+	virtual void Reset(void) override;
 } ;
 
 
diff --git a/src/Generating/RainbowRoadsGen.cpp b/src/Generating/RainbowRoadsGen.cpp
index 2422bd33e..c3c07cdec 100644
--- a/src/Generating/RainbowRoadsGen.cpp
+++ b/src/Generating/RainbowRoadsGen.cpp
@@ -71,8 +71,8 @@ protected:
 	cPlacedPieces m_Pieces;
 	
 	
-	// cGridStructGen::cStructure /*override*/s:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
+	// cGridStructGen::cStructure overrides:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
 	{
 		for (cPlacedPieces::iterator itr = m_Pieces.begin(), end = m_Pieces.end(); itr != end; ++itr)
 		{
diff --git a/src/Generating/RainbowRoadsGen.h b/src/Generating/RainbowRoadsGen.h
index e08e7bf97..5813e1d14 100644
--- a/src/Generating/RainbowRoadsGen.h
+++ b/src/Generating/RainbowRoadsGen.h
@@ -38,8 +38,8 @@ protected:
 	int m_MaxSize;
 
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/Ravines.cpp b/src/Generating/Ravines.cpp
index 5402c2ced..70b9d0b62 100644
--- a/src/Generating/Ravines.cpp
+++ b/src/Generating/Ravines.cpp
@@ -69,8 +69,8 @@ public:
 	#endif  // _DEBUG
 
 protected:
-	// cGridStructGen::cStructure /*override*/s:
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cGridStructGen::cStructure overrides:
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
diff --git a/src/Generating/Ravines.h b/src/Generating/Ravines.h
index ab94c28a0..3e41c5ce6 100644
--- a/src/Generating/Ravines.h
+++ b/src/Generating/Ravines.h
@@ -31,8 +31,8 @@ protected:
 	int    m_Size;  // Max size, in blocks, of the ravines generated
 	
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/RoughRavines.cpp b/src/Generating/RoughRavines.cpp
index 1953e1a23..2ee3704b3 100644
--- a/src/Generating/RoughRavines.cpp
+++ b/src/Generating/RoughRavines.cpp
@@ -152,7 +152,7 @@ protected:
 	}
 	
 	
-	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) /*override*/
+	virtual void DrawIntoChunk(cChunkDesc & a_ChunkDesc) override
 	{
 		int BlockStartX = a_ChunkDesc.GetChunkX() * cChunkDef::Width;
 		int BlockStartZ = a_ChunkDesc.GetChunkZ() * cChunkDef::Width;
diff --git a/src/Generating/RoughRavines.h b/src/Generating/RoughRavines.h
index 12c132d86..4c905b641 100644
--- a/src/Generating/RoughRavines.h
+++ b/src/Generating/RoughRavines.h
@@ -77,8 +77,8 @@ protected:
 	/** Minimum ceiling height at the ravine's center */
 	float m_MinCeilingHeightCenter;
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 };
 
 
diff --git a/src/Generating/StructGen.h b/src/Generating/StructGen.h
index 8bbf71f00..55d5bc1c7 100644
--- a/src/Generating/StructGen.h
+++ b/src/Generating/StructGen.h
@@ -64,8 +64,8 @@ protected:
 		const cChunkDef::BiomeMap & a_Biomes
 	);
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
@@ -100,8 +100,8 @@ protected:
 	OreList   m_OreList;  // A list of possible ores.
 	BLOCKTYPE m_ToReplace;
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 	
 	void GenerateOre(int a_ChunkX, int a_ChunkZ, BLOCKTYPE a_OreType, int a_MaxHeight, int a_NumNests, int a_NestSize, cChunkDef::BlockTypes & a_BlockTypes, int a_Seq);
 } ;
@@ -130,8 +130,8 @@ protected:
 	cTerrainHeightGen & m_HeiGen;
 	int                 m_Probability;  ///< Chance, 0 .. 100, of a chunk having the lake
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 	
 	/// Creates a lake image for the specified chunk into a_Lake
 	void CreateLakeImage(int a_ChunkX, int a_ChunkZ, cBlockArea & a_Lake);
@@ -152,8 +152,8 @@ protected:
 	cNoise    m_Noise1;
 	cNoise    m_Noise2;
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 
 	bool HasWantedBiome(cChunkDesc & a_ChunkDesc) const;
 } ;
@@ -174,8 +174,8 @@ protected:
 	cNoise m_NoiseZ;
 	cNoise m_NoiseH;
 	
-	// cFinishGen /*override*/:
-	virtual void GenFinish(cChunkDesc & a_ChunkDesc) /*override*/;
+	// cFinishGen override:
+	virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
 } ;
 
 
diff --git a/src/Generating/TestRailsGen.cpp b/src/Generating/TestRailsGen.cpp
index 2d8f7d675..66ab8b33f 100644
--- a/src/Generating/TestRailsGen.cpp
+++ b/src/Generating/TestRailsGen.cpp
@@ -71,8 +71,8 @@ protected:
 	cPlacedPieces m_Pieces;
 	
 	
-	// cGridStructGen::cStructure /*override*/s:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
+	// cGridStructGen::cStructure overrides:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
 	{
 		for (cPlacedPieces::iterator itr = m_Pieces.begin(), end = m_Pieces.end(); itr != end; ++itr)
 		{
diff --git a/src/Generating/TestRailsGen.h b/src/Generating/TestRailsGen.h
index c7f4316ac..5b0ce95f4 100644
--- a/src/Generating/TestRailsGen.h
+++ b/src/Generating/TestRailsGen.h
@@ -38,8 +38,8 @@ protected:
 	int m_MaxSize;
 
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/UnderwaterBaseGen.cpp b/src/Generating/UnderwaterBaseGen.cpp
index 729789b34..9278ea546 100644
--- a/src/Generating/UnderwaterBaseGen.cpp
+++ b/src/Generating/UnderwaterBaseGen.cpp
@@ -71,8 +71,8 @@ protected:
 	cPlacedPieces m_Pieces;
 	
 	
-	// cGridStructGen::cStructure /*override*/s:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
+	// cGridStructGen::cStructure overrides:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
 	{
 		for (cPlacedPieces::iterator itr = m_Pieces.begin(), end = m_Pieces.end(); itr != end; ++itr)
 		{
diff --git a/src/Generating/UnderwaterBaseGen.h b/src/Generating/UnderwaterBaseGen.h
index 8b0874cd1..d6267b602 100644
--- a/src/Generating/UnderwaterBaseGen.h
+++ b/src/Generating/UnderwaterBaseGen.h
@@ -41,8 +41,8 @@ protected:
 	cBiomeGen & m_BiomeGen;
 
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp
index f74b996a1..a7f66b75e 100644
--- a/src/Generating/VillageGen.cpp
+++ b/src/Generating/VillageGen.cpp
@@ -84,8 +84,8 @@ public:
 	}
 	
 	
-	// cPrefabPiecePool /*override*/s:
-	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) /*override*/
+	// cPrefabPiecePool overrides:
+	virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) override
 	{
 		// Roads cannot branch T-wise (appending -2 connector to a +2 connector on a 1-high piece):
 		if ((a_ExistingConnector.m_Type == 2) && (a_PlacedPiece.GetDepth() > 0) && (a_PlacedPiece.GetPiece().GetSize().y == 1))
@@ -187,8 +187,8 @@ protected:
 	BLOCKTYPE m_WaterRoadBlock;
 	
 	
-	// cGridStructGen::cStructure /*override*/s:
-	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) /*override*/
+	// cGridStructGen::cStructure overrides:
+	virtual void DrawIntoChunk(cChunkDesc & a_Chunk) override
 	{
 		// Iterate over all items
 		// Each intersecting prefab is placed on ground, then drawn
@@ -258,7 +258,7 @@ protected:
 	}
 	
 	
-	// cPiecePool /*override*/s:
+	// cPiecePool overrides:
 	virtual cPieces GetPiecesWithConnector(int a_ConnectorType)
 	{
 		return m_Prefabs.GetPiecesWithConnector(a_ConnectorType);
@@ -275,7 +275,7 @@ protected:
 		const cPlacedPiece & a_PlacedPiece,
 		const cPiece::cConnector & a_ExistingConnector,
 		const cPiece & a_NewPiece
-	) /*override*/
+	) override
 	{
 		// Check against the density:
 		if (a_ExistingConnector.m_Type == 1)
@@ -293,19 +293,19 @@ protected:
 	}
 	
 	
-	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) /*override*/
+	virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) override
 	{
 		return m_Prefabs.GetStartingPieceWeight(a_NewPiece);
 	}
 	
 	
-	virtual void PiecePlaced(const cPiece & a_Piece) /*override*/
+	virtual void PiecePlaced(const cPiece & a_Piece) override
 	{
 		m_Prefabs.PiecePlaced(a_Piece);
 	}
 	
 	
-	virtual void Reset(void) /*override*/
+	virtual void Reset(void) override
 	{
 		m_Prefabs.Reset();
 	}
diff --git a/src/Generating/VillageGen.h b/src/Generating/VillageGen.h
index ad316b66f..694ea2358 100644
--- a/src/Generating/VillageGen.h
+++ b/src/Generating/VillageGen.h
@@ -48,8 +48,8 @@ protected:
 	cTerrainHeightGen & m_HeightGen;
 
 
-	// cGridStructGen /*override*/s:
-	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) /*override*/;
+	// cGridStructGen overrides:
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Globals.h b/src/Globals.h
index 80afff80a..de1024010 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -10,7 +10,7 @@
 
 // Compiler-dependent stuff:
 #if defined(_MSC_VER)
-	// MSVC produces warning C4481 on the /*override*/ keyword usage, so disable the warning altogether
+	// MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether
 	#pragma warning(disable:4481)
 
 	// Disable some warnings that we don't care about:
@@ -56,9 +56,9 @@
 	// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)?
 	#define abstract
 
-	// /*override*/ is part of c++11
+	// override is part of c++11
 	#if __cplusplus < 201103L
-		#define /*override*/
+		#define override
 	#endif
 
 	#define OBSOLETE __attribute__((deprecated))
@@ -103,7 +103,7 @@
 	#define abstract
 
 	// Mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class)
-	#define /*override*/
+	#define override
 
 	// Mark functions as obsolete, so that their usage results in a compile-time warning
 	#define OBSOLETE
diff --git a/src/HTTPServer/HTTPConnection.h b/src/HTTPServer/HTTPConnection.h
index 052f93c17..6ea8a1ae8 100644
--- a/src/HTTPServer/HTTPConnection.h
+++ b/src/HTTPServer/HTTPConnection.h
@@ -90,16 +90,16 @@ protected:
 	size_t m_CurrentRequestBodyRemaining;
 	
 	
-	// cSocketThreads::cCallback /*override*/s:
+	// cSocketThreads::cCallback overrides:
 	/** Data is received from the client.
 	Returns true if the connection has been closed as the result of parsing the data. */
-	virtual bool DataReceived(const char * a_Data, size_t a_Size) /*override*/;
+	virtual bool DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	/** Data can be sent to client */
-	virtual void GetOutgoingData(AString & a_Data) /*override*/;
+	virtual void GetOutgoingData(AString & a_Data) override;
 	
 	/** The socket has been closed for any reason */
-	virtual void SocketClosed(void) /*override*/;
+	virtual void SocketClosed(void) override;
 } ;
 
 typedef std::vector<cHTTPConnection *> cHTTPConnections;
diff --git a/src/HTTPServer/HTTPFormParser.h b/src/HTTPServer/HTTPFormParser.h
index c70277380..edc6d2471 100644
--- a/src/HTTPServer/HTTPFormParser.h
+++ b/src/HTTPServer/HTTPFormParser.h
@@ -103,11 +103,11 @@ protected:
 	/// Parses m_IncomingData as form-urlencoded data (fpkURL or fpkFormUrlEncoded kinds)
 	void ParseFormUrlEncoded(void);
 	
-	// cMultipartParser::cCallbacks /*override*/s:
-	virtual void OnPartStart (void) /*override*/;
-	virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) /*override*/;
-	virtual void OnPartData  (const char * a_Data, size_t a_Size) /*override*/;
-	virtual void OnPartEnd   (void) /*override*/;
+	// cMultipartParser::cCallbacks overrides:
+	virtual void OnPartStart (void) override;
+	virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) override;
+	virtual void OnPartData  (const char * a_Data, size_t a_Size) override;
+	virtual void OnPartEnd   (void) override;
 } ;
 
 
diff --git a/src/HTTPServer/HTTPMessage.h b/src/HTTPServer/HTTPMessage.h
index 81b9ffc61..c0667030f 100644
--- a/src/HTTPServer/HTTPMessage.h
+++ b/src/HTTPServer/HTTPMessage.h
@@ -149,8 +149,8 @@ protected:
 	*/
 	size_t ParseRequestLine(const char * a_Data, size_t a_Size);
 	
-	// cEnvelopeParser::cCallbacks /*override*/s:
-	virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) /*override*/;
+	// cEnvelopeParser::cCallbacks overrides:
+	virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) override;
 } ;
 
 
diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp
index 436f02a93..8eabe5cb2 100644
--- a/src/HTTPServer/HTTPServer.cpp
+++ b/src/HTTPServer/HTTPServer.cpp
@@ -28,7 +28,7 @@ class cDebugCallbacks :
 	public cHTTPServer::cCallbacks,
 	protected cHTTPFormParser::cCallbacks
 {
-		virtual void OnRequestBegun(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) /*override*/
+		virtual void OnRequestBegun(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override
 		{
 			UNUSED(a_Connection);
 			
@@ -39,7 +39,7 @@ class cDebugCallbacks :
 		}
 		
 		
-		virtual void OnRequestBody(cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) /*override*/
+		virtual void OnRequestBody(cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) override
 		{
 			UNUSED(a_Connection);
 			
@@ -51,7 +51,7 @@ class cDebugCallbacks :
 		}
 		
 		
-		virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) /*override*/
+		virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override
 		{
 			cHTTPFormParser * FormParser = (cHTTPFormParser *)(a_Request.GetUserData());
 			if (FormParser != NULL)
@@ -95,19 +95,19 @@ class cDebugCallbacks :
 		}
 		
 		
-		virtual void OnFileStart(cHTTPFormParser & a_Parser, const AString & a_FileName) /*override*/
+		virtual void OnFileStart(cHTTPFormParser & a_Parser, const AString & a_FileName) override
 		{
 			// TODO
 		}
 		
 		
-		virtual void OnFileData(cHTTPFormParser & a_Parser, const char * a_Data, size_t a_Size) /*override*/
+		virtual void OnFileData(cHTTPFormParser & a_Parser, const char * a_Data, size_t a_Size) override
 		{
 			// TODO
 		}
 		
 
-		virtual void OnFileEnd(cHTTPFormParser & a_Parser) /*override*/
+		virtual void OnFileEnd(cHTTPFormParser & a_Parser) override
 		{
 			// TODO
 		}
diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h
index 66506fe04..522b7da62 100644
--- a/src/HTTPServer/HTTPServer.h
+++ b/src/HTTPServer/HTTPServer.h
@@ -89,8 +89,8 @@ protected:
 	cCryptoKeyPtr m_CertPrivKey;
 	
 
-	// cListenThread::cCallback /*override*/s:
-	virtual void OnConnectionAccepted(cSocket & a_Socket) /*override*/;
+	// cListenThread::cCallback overrides:
+	virtual void OnConnectionAccepted(cSocket & a_Socket) override;
 	
 	/// Called by cHTTPConnection to close the connection (presumably due to an error)
 	void CloseConnection(cHTTPConnection & a_Connection);
diff --git a/src/HTTPServer/MultipartParser.cpp b/src/HTTPServer/MultipartParser.cpp
index b3ca833a3..09732c5f7 100644
--- a/src/HTTPServer/MultipartParser.cpp
+++ b/src/HTTPServer/MultipartParser.cpp
@@ -57,25 +57,25 @@ ThisIsIgnoredEpilogue";
 		printf("Multipart parsing test finished\n");
 	}
 	
-	virtual void OnPartStart(void) /*override*/
+	virtual void OnPartStart(void) override
 	{
 		printf("Starting a new part\n");
 	}
 	
 	
-	virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) /*override*/
+	virtual void OnPartHeader(const AString & a_Key, const AString & a_Value) override
 	{
 		printf("  Hdr: \"%s\"=\"%s\"\n", a_Key.c_str(), a_Value.c_str());
 	}
 	
 	
-	virtual void OnPartData(const char * a_Data, int a_Size) /*override*/
+	virtual void OnPartData(const char * a_Data, int a_Size) override
 	{
 		printf("  Data: %d bytes, \"%.*s\"\n", a_Size, a_Size, a_Data);
 	}
 	
 	
-	virtual void OnPartEnd(void) /*override*/
+	virtual void OnPartEnd(void) override
 	{
 		printf("Part end\n");
 	}
diff --git a/src/HTTPServer/MultipartParser.h b/src/HTTPServer/MultipartParser.h
index 16a32920f..ad76ad650 100644
--- a/src/HTTPServer/MultipartParser.h
+++ b/src/HTTPServer/MultipartParser.h
@@ -70,8 +70,8 @@ protected:
 	/** Parse one line of incoming data in the headers section of a part. The CRLF has already been stripped from a_Data / a_Size */
 	void ParseHeaderLine(const char * a_Data, size_t a_Size);
 	
-	// cEnvelopeParser /*override*/s:
-	virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) /*override*/;
+	// cEnvelopeParser overrides:
+	virtual void OnHeaderLine(const AString & a_Key, const AString & a_Value) override;
 } ;
 
 
diff --git a/src/HTTPServer/SslHTTPConnection.h b/src/HTTPServer/SslHTTPConnection.h
index 5bcd642f3..c2c1585cd 100644
--- a/src/HTTPServer/SslHTTPConnection.h
+++ b/src/HTTPServer/SslHTTPConnection.h
@@ -35,9 +35,9 @@ protected:
 	/** The private key used for the certificate */
 	cCryptoKeyPtr m_PrivateKey;
 	
-	// cHTTPConnection /*override*/s:
-	virtual bool DataReceived   (const char * a_Data, size_t a_Size) /*override*/;  // Data is received from the client
-	virtual void GetOutgoingData(AString & a_Data) /*override*/;  // Data can be sent to client
+	// cHTTPConnection overrides:
+	virtual bool DataReceived   (const char * a_Data, size_t a_Size) override;  // Data is received from the client
+	virtual void GetOutgoingData(AString & a_Data) override;  // Data can be sent to client
 } ;
 
 
diff --git a/src/Inventory.h b/src/Inventory.h
index 701c376de..5628fb0da 100644
--- a/src/Inventory.h
+++ b/src/Inventory.h
@@ -185,8 +185,8 @@ protected:
 	/** Returns the ItemGrid and the (grid-local) slot number for a (global) slot number; return NULL for invalid SlotNum */
 	cItemGrid * GetGridForSlotNum(int a_SlotNum, int & a_GridSlotNum);
 	
-	// cItemGrid::cListener /*override*/:
-	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+	// cItemGrid::cListener override:
+	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
 };  // tolua_export
 
 
diff --git a/src/Items/ItemArmor.h b/src/Items/ItemArmor.h
index cc7f15078..2436df5bd 100644
--- a/src/Items/ItemArmor.h
+++ b/src/Items/ItemArmor.h
@@ -18,7 +18,7 @@ public:
 	}
 
 	/** Move the armor to the armor slot of the player's inventory */
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		int SlotNum;
 		if (ItemCategory::IsHelmet(a_Item.m_ItemType))
@@ -60,7 +60,7 @@ public:
 		return true;
 	}
 
-	virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/
+	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
 	{
 		switch (m_ItemType)
 		{
diff --git a/src/Items/ItemBed.h b/src/Items/ItemBed.h
index dd48c57f7..94a14cf16 100644
--- a/src/Items/ItemBed.h
+++ b/src/Items/ItemBed.h
@@ -19,7 +19,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -29,7 +29,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		if (a_BlockFace != BLOCK_FACE_TOP)
 		{
diff --git a/src/Items/ItemBoat.h b/src/Items/ItemBoat.h
index 5c50c6321..7faac1e32 100644
--- a/src/Items/ItemBoat.h
+++ b/src/Items/ItemBoat.h
@@ -28,7 +28,7 @@ public:
 	
 	
 	
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		if ((a_Dir != BLOCK_FACE_YM) && (a_Dir != BLOCK_FACE_NONE))
 		{
@@ -47,7 +47,7 @@ public:
 			{
 			}
 			
-			virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) /*override*/
+			virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override
 			{
 				if (a_CBBlockType != E_BLOCK_AIR)
 				{
diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h
index 639442481..f29cc5d59 100644
--- a/src/Items/ItemBow.h
+++ b/src/Items/ItemBow.h
@@ -27,7 +27,7 @@ public:
 	}
 	
 	
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		ASSERT(a_Player != NULL);
 		
@@ -42,7 +42,7 @@ public:
 	}
 	
 	
-	virtual void OnItemShoot(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual void OnItemShoot(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		// Actual shot - produce the arrow with speed based on the ticks that the bow was charged
 		ASSERT(a_Player != NULL);
diff --git a/src/Items/ItemBrewingStand.h b/src/Items/ItemBrewingStand.h
index 95e2fedca..7be57763c 100644
--- a/src/Items/ItemBrewingStand.h
+++ b/src/Items/ItemBrewingStand.h
@@ -17,7 +17,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -28,7 +28,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_BREWING_STAND;
 		a_BlockMeta = 0;
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h
index 6e994555b..a17c4838b 100644
--- a/src/Items/ItemBucket.h
+++ b/src/Items/ItemBucket.h
@@ -22,7 +22,7 @@ public:
 
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		switch (m_ItemType)
 		{
@@ -156,7 +156,7 @@ public:
 			{
 			}
 			
-			virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/
+			virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
 			{
 				if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
 				{
@@ -198,7 +198,7 @@ public:
 			Vector3i   m_Pos;
 			BLOCKTYPE  m_ReplacedBlock;
 			
-			virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/
+			virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
 			{
 				if (a_BlockType != E_BLOCK_AIR)
 				{
diff --git a/src/Items/ItemCake.h b/src/Items/ItemCake.h
index dab756a3f..d1cb091b6 100644
--- a/src/Items/ItemCake.h
+++ b/src/Items/ItemCake.h
@@ -17,7 +17,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -28,7 +28,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_CAKE;
 		a_BlockMeta = 0;
diff --git a/src/Items/ItemCauldron.h b/src/Items/ItemCauldron.h
index 4cc222bec..9617c30ef 100644
--- a/src/Items/ItemCauldron.h
+++ b/src/Items/ItemCauldron.h
@@ -17,7 +17,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -28,7 +28,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_CAULDRON;
 		a_BlockMeta = 0;
diff --git a/src/Items/ItemComparator.h b/src/Items/ItemComparator.h
index ebe207fc9..fc843c186 100644
--- a/src/Items/ItemComparator.h
+++ b/src/Items/ItemComparator.h
@@ -17,7 +17,7 @@ public:
 	{
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -27,7 +27,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_INACTIVE_COMPARATOR;
 		a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw());
diff --git a/src/Items/ItemDoor.h b/src/Items/ItemDoor.h
index ca89ee65f..c1b439024 100644
--- a/src/Items/ItemDoor.h
+++ b/src/Items/ItemDoor.h
@@ -18,7 +18,7 @@ public:
 
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -28,7 +28,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = (m_ItemType == E_ITEM_WOODEN_DOOR) ? E_BLOCK_WOODEN_DOOR : E_BLOCK_IRON_DOOR;
 		cChunkInterface ChunkInterface(a_World->GetChunkMap());
diff --git a/src/Items/ItemDye.h b/src/Items/ItemDye.h
index d57f4700c..ccf4714f7 100644
--- a/src/Items/ItemDye.h
+++ b/src/Items/ItemDye.h
@@ -19,7 +19,7 @@ public:
 
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		// Handle growing the plants:
 		if (a_Item.m_ItemDamage == E_META_DYE_WHITE)
diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h
index 5e16c0d6b..953673382 100644
--- a/src/Items/ItemEmptyMap.h
+++ b/src/Items/ItemEmptyMap.h
@@ -27,7 +27,7 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		UNUSED(a_Item);
 		UNUSED(a_BlockX);
diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index 63e9a46a6..6350a38ba 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -31,7 +31,7 @@ public:
 	{
 	}
 
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		m_CanPickup = ((cFloater *)a_Entity)->CanPickup();
 		m_Pos = Vector3d(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ());
@@ -67,7 +67,7 @@ public:
 	{
 	}
 
-	virtual bool Item(cEntity * a_Entity) /*override*/
+	virtual bool Item(cEntity * a_Entity) override
 	{
 		Vector3d Speed = m_PlayerPos - a_Entity->GetPosition();
 		a_Entity->AddSpeed(Speed);
@@ -93,7 +93,7 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		if (a_Dir != BLOCK_FACE_NONE)
 		{
diff --git a/src/Items/ItemFlowerPot.h b/src/Items/ItemFlowerPot.h
index 9fbc0e978..320dce997 100644
--- a/src/Items/ItemFlowerPot.h
+++ b/src/Items/ItemFlowerPot.h
@@ -17,7 +17,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -28,7 +28,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_FLOWER_POT;
 		a_BlockMeta = 0;
diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h
index 3f67463ed..9035344df 100644
--- a/src/Items/ItemFood.h
+++ b/src/Items/ItemFood.h
@@ -18,13 +18,13 @@ public:
 	}
 
 
-	virtual bool IsFood(void) /*override*/
+	virtual bool IsFood(void) override
 	{
 		return true;
 	}
 
 
-	virtual FoodInfo GetFoodInfo(void) /*override*/
+	virtual FoodInfo GetFoodInfo(void) override
 	{
 		switch (m_ItemType)
 		{
@@ -58,7 +58,7 @@ public:
 		return FoodInfo(0, 0.f);
 	}
 
-	virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) /*override*/
+	virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) override
 	{
 		switch (m_ItemType)
 		{
diff --git a/src/Items/ItemGoldenApple.h b/src/Items/ItemGoldenApple.h
index e5ecf9c3e..02ac0202c 100644
--- a/src/Items/ItemGoldenApple.h
+++ b/src/Items/ItemGoldenApple.h
@@ -18,7 +18,7 @@ public:
 	}
 
 
-	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) /*override*/
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
 	{
 		// Feed the player:
 		FoodInfo Info = GetFoodInfo();
@@ -40,13 +40,13 @@ public:
 	}
 
 
-	virtual FoodInfo GetFoodInfo(void) /*override*/
+	virtual FoodInfo GetFoodInfo(void) override
 	{
 		return FoodInfo(4, 9.6);
 	}
 
 
-	virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) /*override*/
+	virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) override
 	{
 		return false;
 	}
diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h
index 01e53d636..8d0b71478 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -18,7 +18,7 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 
@@ -33,7 +33,7 @@ public:
 	}
 
 
-	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) /*override*/
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
 	{
 		return 0;
 	}
diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h
index ba8300015..87e20ecf0 100644
--- a/src/Items/ItemItemFrame.h
+++ b/src/Items/ItemItemFrame.h
@@ -19,7 +19,7 @@ public:
 
 	}
 
-	virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		if ((a_Dir == BLOCK_FACE_NONE) || (a_Dir == BLOCK_FACE_YP) || (a_Dir == BLOCK_FACE_YM))
 		{
diff --git a/src/Items/ItemLeaves.h b/src/Items/ItemLeaves.h
index cce62e687..f48126dc5 100644
--- a/src/Items/ItemLeaves.h
+++ b/src/Items/ItemLeaves.h
@@ -23,7 +23,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		bool res = super::GetPlacementBlockTypeMeta(
 			a_World, a_Player,
diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h
index 6d6119638..9f98bf85f 100644
--- a/src/Items/ItemLighter.h
+++ b/src/Items/ItemLighter.h
@@ -19,7 +19,7 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		if (a_BlockFace < 0)
 		{
diff --git a/src/Items/ItemLilypad.h b/src/Items/ItemLilypad.h
index f5a8bdabb..b9d837384 100644
--- a/src/Items/ItemLilypad.h
+++ b/src/Items/ItemLilypad.h
@@ -23,13 +23,13 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return false;  // Set as not placeable so OnItemUse is called
 	}
 
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		if (a_BlockFace > BLOCK_FACE_NONE)
 		{
@@ -53,7 +53,7 @@ public:
 			{
 			}
 
-			virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) /*override*/
+			virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override
 			{
 				if (IsBlockWater(a_CBBlockType))
 				{
diff --git a/src/Items/ItemMilk.h b/src/Items/ItemMilk.h
index 32932bde9..db7bc13be 100644
--- a/src/Items/ItemMilk.h
+++ b/src/Items/ItemMilk.h
@@ -11,13 +11,13 @@ public:
 	{
 	}
 	
-	virtual bool IsDrinkable(short a_ItemDamage) /*override*/
+	virtual bool IsDrinkable(short a_ItemDamage) override
 	{
 		UNUSED(a_ItemDamage);
 		return true;
 	}
 	
-	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) /*override*/
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
 	{
 		UNUSED(a_Item);
 		a_Player->ClearEntityEffects();
diff --git a/src/Items/ItemMinecart.h b/src/Items/ItemMinecart.h
index c0d179fc2..63038de51 100644
--- a/src/Items/ItemMinecart.h
+++ b/src/Items/ItemMinecart.h
@@ -27,7 +27,7 @@ public:
 	
 	
 	
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		if (a_Dir < 0)
 		{
diff --git a/src/Items/ItemMobHead.h b/src/Items/ItemMobHead.h
index 6317de555..4c36fe8d8 100644
--- a/src/Items/ItemMobHead.h
+++ b/src/Items/ItemMobHead.h
@@ -18,7 +18,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -29,7 +29,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_HEAD;
 		a_BlockMeta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage & 0x0f);
diff --git a/src/Items/ItemNetherWart.h b/src/Items/ItemNetherWart.h
index 3ada15464..10a0864b5 100644
--- a/src/Items/ItemNetherWart.h
+++ b/src/Items/ItemNetherWart.h
@@ -18,7 +18,7 @@ public:
 
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -28,7 +28,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		if (a_BlockFace != BLOCK_FACE_TOP)
 		{
diff --git a/src/Items/ItemPainting.h b/src/Items/ItemPainting.h
index bbe13e21f..a2a77ce21 100644
--- a/src/Items/ItemPainting.h
+++ b/src/Items/ItemPainting.h
@@ -19,7 +19,7 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		if (a_Dir == BLOCK_FACE_NONE)
 		{
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index ee819e85b..17fd96822 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -30,7 +30,7 @@ public:
 		}
 	}
 	
-	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/
+	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
 	{
 		switch (a_BlockType)
 		{
@@ -88,7 +88,7 @@ public:
 		return super::CanHarvestBlock(a_BlockType);
 	}
 
-	virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/
+	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
 	{
 		switch (m_ItemType)
 		{
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index 110d47fca..24614cd8a 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -17,8 +17,8 @@ public:
 	}
 	
 
-	// cItemHandler /*override*/s:
-	virtual bool IsDrinkable(short a_ItemDamage) /*override*/
+	// cItemHandler overrides:
+	virtual bool IsDrinkable(short a_ItemDamage) override
 	{
 		// Drinkable potion if 13th lowest bit is set
 		// Ref.: http://minecraft.gamepedia.com/Potions#Data_value_table
@@ -26,7 +26,7 @@ public:
 	}
 
 	
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		short PotionDamage = a_Item.m_ItemDamage;
 		
@@ -53,7 +53,7 @@ public:
 	}
 	
 	
-	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) /*override*/
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
 	{
 		short PotionDamage = a_Item->m_ItemDamage;
 		
diff --git a/src/Items/ItemRedstoneDust.h b/src/Items/ItemRedstoneDust.h
index 709c84a2d..a2289239c 100644
--- a/src/Items/ItemRedstoneDust.h
+++ b/src/Items/ItemRedstoneDust.h
@@ -15,7 +15,7 @@ public:
 	{
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -25,7 +25,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		if (!cBlockInfo::FullyOccupiesVoxel(a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ)))  // Some solid blocks, such as cocoa beans, are not suitable for dust
 		{
diff --git a/src/Items/ItemRedstoneRepeater.h b/src/Items/ItemRedstoneRepeater.h
index 930acb065..13a797d00 100644
--- a/src/Items/ItemRedstoneRepeater.h
+++ b/src/Items/ItemRedstoneRepeater.h
@@ -17,7 +17,7 @@ public:
 	{
 	}
 
-	virtual bool IsPlaceable() /*override*/
+	virtual bool IsPlaceable() override
 	{
 		return true;
 	}
@@ -27,7 +27,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_REDSTONE_REPEATER_OFF;
 		a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw());
diff --git a/src/Items/ItemSapling.h b/src/Items/ItemSapling.h
index a70ae6de5..dbcb12be5 100644
--- a/src/Items/ItemSapling.h
+++ b/src/Items/ItemSapling.h
@@ -23,7 +23,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		bool res = super::GetPlacementBlockTypeMeta(
 			a_World, a_Player,
diff --git a/src/Items/ItemSeeds.h b/src/Items/ItemSeeds.h
index 5b5b91626..e1db7c5f4 100644
--- a/src/Items/ItemSeeds.h
+++ b/src/Items/ItemSeeds.h
@@ -18,12 +18,12 @@ public:
 
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
 
-	virtual bool IsFood(void) /*override*/
+	virtual bool IsFood(void) override
 	{
 		switch (m_ItemType)  // Special cases, both a seed and food
 		{
@@ -33,7 +33,7 @@ public:
 		}
 	}
 
-	virtual FoodInfo GetFoodInfo(void) /*override*/
+	virtual FoodInfo GetFoodInfo(void) override
 	{
 		switch (m_ItemType)
 		{
@@ -48,7 +48,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		if (a_BlockFace != BLOCK_FACE_TOP)
 		{
diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h
index 77d5df3ba..fa2794df2 100644
--- a/src/Items/ItemShears.h
+++ b/src/Items/ItemShears.h
@@ -20,13 +20,13 @@ public:
 	}
 	
 	
-	virtual bool IsTool(void) /*override*/
+	virtual bool IsTool(void) override
 	{
 		return true;
 	}
 	
 	
-	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 		if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES))
@@ -47,7 +47,7 @@ public:
 	}
 
 
-	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/
+	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
 	{
 		switch (a_BlockType)
 		{
@@ -63,13 +63,13 @@ public:
 	}
 
 
-	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) /*override*/
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
 	{
 		return 0;
 	}
 
 
-	virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+	virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
 
diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h
index 9c35e755c..cd235678d 100644
--- a/src/Items/ItemShovel.h
+++ b/src/Items/ItemShovel.h
@@ -21,7 +21,7 @@ public:
 	{
 	}
 
-	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 		if (Block == E_BLOCK_SNOW)
@@ -37,7 +37,7 @@ public:
 		return false;
 	}
 	
-	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/
+	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
 	{
 		if (a_BlockType == E_BLOCK_SNOW)
 		{
@@ -46,7 +46,7 @@ public:
 		return super::CanHarvestBlock(a_BlockType);
 	}
 
-	virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/
+	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
 	{
 		switch (m_ItemType)
 		{
diff --git a/src/Items/ItemSign.h b/src/Items/ItemSign.h
index 42d30906b..0fa0fa0be 100644
--- a/src/Items/ItemSign.h
+++ b/src/Items/ItemSign.h
@@ -20,7 +20,7 @@ public:
 	}
 
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -31,7 +31,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		if (a_BlockFace == BLOCK_FACE_TOP)
 		{
diff --git a/src/Items/ItemSpawnEgg.h b/src/Items/ItemSpawnEgg.h
index 971aa9edf..bba97afa1 100644
--- a/src/Items/ItemSpawnEgg.h
+++ b/src/Items/ItemSpawnEgg.h
@@ -19,7 +19,7 @@ public:
 	}
 
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
 		if (a_BlockFace < 0)
 		{
diff --git a/src/Items/ItemString.h b/src/Items/ItemString.h
index db01462dc..a97fbe0ce 100644
--- a/src/Items/ItemString.h
+++ b/src/Items/ItemString.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -26,7 +26,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-		) /*override*/
+		) override
 	{
 		a_BlockType = E_BLOCK_TRIPWIRE;
 		a_BlockMeta = 0;
diff --git a/src/Items/ItemSugarcane.h b/src/Items/ItemSugarcane.h
index 86e90f838..dd2e2ece3 100644
--- a/src/Items/ItemSugarcane.h
+++ b/src/Items/ItemSugarcane.h
@@ -16,7 +16,7 @@ public:
 	{
 	}
 
-	virtual bool IsPlaceable(void) /*override*/
+	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
@@ -26,7 +26,7 @@ public:
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
-	) /*override*/
+	) override
 	{
 		a_BlockType = E_BLOCK_SUGARCANE;
 		a_BlockMeta = 0;
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index e806801e0..2b2dbfc0d 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -20,7 +20,7 @@ public:
 	}
 
 
-	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/
+	virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
 	{
 		if (a_BlockType == E_BLOCK_COBWEB)
 		{
@@ -30,7 +30,7 @@ public:
 	}
 
 
-	virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/
+	virtual bool CanRepairWithRawMaterial(short a_ItemType) override
 	{
 		switch (m_ItemType)
 		{
@@ -44,7 +44,7 @@ public:
 	}
 
 
-	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) /*override*/
+	virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
 	{
 		switch ((int)a_Action)
 		{
diff --git a/src/Items/ItemThrowable.h b/src/Items/ItemThrowable.h
index 9d1280eb5..c151c5d3a 100644
--- a/src/Items/ItemThrowable.h
+++ b/src/Items/ItemThrowable.h
@@ -26,7 +26,7 @@ public:
 	}
 	
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		Vector3d Pos = a_Player->GetThrowStartPos();
 		Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff;
@@ -128,7 +128,7 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
 		if (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_AIR)
 		{
diff --git a/src/LightingThread.cpp b/src/LightingThread.cpp
index 281e5ab1a..652b03e46 100644
--- a/src/LightingThread.cpp
+++ b/src/LightingThread.cpp
@@ -18,7 +18,7 @@
 class cReader :
 	public cChunkDataCallback
 {
-	virtual void ChunkData(const cChunkData & a_ChunkBuffer) /*override*/
+	virtual void ChunkData(const cChunkData & a_ChunkBuffer) override
 	{
 		BLOCKTYPE * OutputRows = m_BlockTypes;
 		int InputIdx = 0;
@@ -39,7 +39,7 @@ class cReader :
 	}  // BlockTypes()
 	
 	
-	virtual void HeightMap(const cChunkDef::HeightMap * a_Heightmap) /*override*/
+	virtual void HeightMap(const cChunkDef::HeightMap * a_Heightmap) override
 	{
 		// Copy the entire heightmap, distribute it into the 3x3 chunk blob:
 		typedef struct {HEIGHTTYPE m_Row[16]; } ROW;
diff --git a/src/LightingThread.h b/src/LightingThread.h
index 1ac09096c..f71d2cf1a 100644
--- a/src/LightingThread.h
+++ b/src/LightingThread.h
@@ -82,13 +82,13 @@ protected:
 		cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter);
 		
 	protected:
-		virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) /*override*/
+		virtual void OnChunkAvailable(int a_ChunkX, int a_ChunkZ) override
 		{
 			UNUSED(a_ChunkX);
 			UNUSED(a_ChunkZ);
 		}
-		virtual bool OnAllChunksAvailable(void) /*override*/;
-		virtual void OnDisabled(void) /*override*/;
+		virtual bool OnAllChunksAvailable(void) override;
+		virtual void OnDisabled(void) override;
 	} ;
 	
 	typedef std::list<cChunkStay *> cChunkStays;
@@ -134,7 +134,7 @@ protected:
 	unsigned int  m_SeedIdx2[BlocksPerYLayer * cChunkDef::Height];
 	int m_NumSeeds;
 
-	virtual void Execute(void) /*override*/;
+	virtual void Execute(void) override;
 
 	/** Lights the entire chunk. If neighbor chunks don't exist, touches them and re-queues the chunk */
 	void LightChunk(cLightingChunkStay & a_Item);
diff --git a/src/LineBlockTracer.h b/src/LineBlockTracer.h
index 3760b5784..ccbb70ea6 100644
--- a/src/LineBlockTracer.h
+++ b/src/LineBlockTracer.h
@@ -77,8 +77,8 @@ protected:
 	/// Moves m_Current to the next block on the line; returns false if no move is possible (reached the end)
 	bool MoveToNextBlock(void);
 	
-	// cChunkCallback /*override*/s:
-	virtual bool Item(cChunk * a_Chunk) /*override*/;
+	// cChunkCallback overrides:
+	virtual bool Item(cChunk * a_Chunk) override;
 } ;
 
 
diff --git a/src/LoggerListeners.cpp b/src/LoggerListeners.cpp
index 6ad94b7bd..85e32c378 100644
--- a/src/LoggerListeners.cpp
+++ b/src/LoggerListeners.cpp
@@ -22,7 +22,7 @@
 		virtual void SetLogColour(cLogger::eLogLevel a_LogLevel) = 0;
 		virtual void SetDefaultLogColour() = 0;
 	
-		virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) /*override*/
+		virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) override
 		{
 			SetLogColour(a_LogLevel);
 			fputs(a_Message.c_str(), stdout);
@@ -48,7 +48,7 @@
 		}
 		
 		#ifdef _DEBUG
-			virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) /*override*/
+			virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) override
 			{
 				super::Log(a_Message, a_LogLevel);
 				// In a Windows Debug build, output the log to debug console as well:
@@ -57,7 +57,7 @@
 		#endif
 
 
-		virtual void SetLogColour(cLogger::eLogLevel a_LogLevel) /*override*/
+		virtual void SetLogColour(cLogger::eLogLevel a_LogLevel) override
 		{
 			// by default, gray on black
 			WORD Attrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
@@ -92,7 +92,7 @@
 		}
 		
 		
-		virtual void SetDefaultLogColour() /*override*/
+		virtual void SetDefaultLogColour() override
 		{
 			SetConsoleTextAttribute(m_Console, m_DefaultConsoleAttrib);
 		}
@@ -113,7 +113,7 @@
 		: public cColouredConsoleListener
 	{
 	public:
-		virtual void SetLogColour(cLogger::eLogLevel a_LogLevel) /*override*/
+		virtual void SetLogColour(cLogger::eLogLevel a_LogLevel) override
 		{
 			switch (a_LogLevel)
 			{
@@ -145,7 +145,7 @@
 		}
 		
 		
-		virtual void SetDefaultLogColour() /*override*/
+		virtual void SetDefaultLogColour() override
 		{
 			// Whatever the console default is 
 			printf("\x1b[0m");
@@ -162,7 +162,7 @@
 		: public cLogger::cListener
 	{
 	public:
-		virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) /*override*/
+		virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) override
 		{
 			android_LogPriority AndroidLogLevel;
 			switch (a_LogLevel)
@@ -202,7 +202,7 @@ class cVanillaCPPConsoleListener
 	: public cLogger::cListener
 {
 public:
-	virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) /*override*/
+	virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) override
 	{
 		AString LogLevelString;
 		switch (a_LogLevel)
diff --git a/src/LoggerListeners.h b/src/LoggerListeners.h
index 06019d0a4..d300184b1 100644
--- a/src/LoggerListeners.h
+++ b/src/LoggerListeners.h
@@ -13,7 +13,7 @@ public:
 	cFileListener();
 	cFileListener(AString a_Filename);
 
-	virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) /*override*/;
+	virtual void Log(AString a_Message, cLogger::eLogLevel a_LogLevel) override;
 	
 private:
 
diff --git a/src/Map.cpp b/src/Map.cpp
index 212e119dc..8f205a606 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -219,7 +219,7 @@ bool cMap::UpdatePixel(unsigned int a_X, unsigned int a_Z)
 		cCalculatePixelCb(cMap * a_Map, int a_RelX, int a_RelZ)
 			: m_Map(a_Map), m_RelX(a_RelX), m_RelZ(a_RelZ), m_PixelData(E_BASE_COLOR_TRANSPARENT) {}
 
-		virtual bool Item(cChunk * a_Chunk) /*override*/
+		virtual bool Item(cChunk * a_Chunk) override
 		{
 			if (a_Chunk == NULL)
 			{
diff --git a/src/Mobs/Blaze.h b/src/Mobs/Blaze.h
index 6698026e9..65645bce9 100644
--- a/src/Mobs/Blaze.h
+++ b/src/Mobs/Blaze.h
@@ -17,5 +17,5 @@ public:
 
 	CLASS_PROTODEF(cBlaze)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
diff --git a/src/Mobs/CaveSpider.h b/src/Mobs/CaveSpider.h
index 25adcf3e0..0dab0d798 100644
--- a/src/Mobs/CaveSpider.h
+++ b/src/Mobs/CaveSpider.h
@@ -16,8 +16,8 @@ public:
 
 	CLASS_PROTODEF(cCaveSpider)
 
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Chicken.h b/src/Mobs/Chicken.h
index a1e6f5ecf..7e52d6d83 100644
--- a/src/Mobs/Chicken.h
+++ b/src/Mobs/Chicken.h
@@ -16,8 +16,8 @@ public:
 
 	CLASS_PROTODEF(cChicken)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 private:
 
diff --git a/src/Mobs/Components/AIAggressiveComponent.h b/src/Mobs/Components/AIAggressiveComponent.h
index 2cea452c5..98854aeab 100644
--- a/src/Mobs/Components/AIAggressiveComponent.h
+++ b/src/Mobs/Components/AIAggressiveComponent.h
@@ -6,7 +6,11 @@ class cEntity;
 class cAIAggressiveComponent : public cAIComponent {
 	typedef cAIComponent super;
 protected:
+	enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState;
+	cEntity * m_Target;
 public:
 	cAIAggressiveComponent(cMonster * a_Monster);
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	
 };
diff --git a/src/Mobs/Cow.h b/src/Mobs/Cow.h
index ab86dafb4..09f68fe13 100644
--- a/src/Mobs/Cow.h
+++ b/src/Mobs/Cow.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cCow)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp
index 354910bf7..9b7fc52c1 100644
--- a/src/Mobs/Creeper.cpp
+++ b/src/Mobs/Creeper.cpp
@@ -48,7 +48,7 @@ void cCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 			{
 			}
 
-			virtual bool Item(cEntity * a_Entity) /*override*/
+			virtual bool Item(cEntity * a_Entity) override
 			{
 				if (a_Entity->IsMob() && ((cMonster *)a_Entity)->GetMobType() == mtSkeleton)
 				{
diff --git a/src/Mobs/Creeper.h b/src/Mobs/Creeper.h
index 10ff3d249..9824608b5 100644
--- a/src/Mobs/Creeper.h
+++ b/src/Mobs/Creeper.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cCreeper)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	bool IsBlowing(void) const {return m_bIsBlowing; }
 	bool IsCharged(void) const {return m_bIsCharged; }
diff --git a/src/Mobs/EnderDragon.h b/src/Mobs/EnderDragon.h
index b75bdb5a5..2876c3b99 100644
--- a/src/Mobs/EnderDragon.h
+++ b/src/Mobs/EnderDragon.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cEnderDragon)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Enderman.h b/src/Mobs/Enderman.h
index b7a547c67..47d92e686 100644
--- a/src/Mobs/Enderman.h
+++ b/src/Mobs/Enderman.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cEnderman)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	bool IsScreaming(void) const {return m_bIsScreaming; }
 	BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; }
diff --git a/src/Mobs/Ghast.h b/src/Mobs/Ghast.h
index a7579e9aa..26f8845a9 100644
--- a/src/Mobs/Ghast.h
+++ b/src/Mobs/Ghast.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cGhast)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	bool IsCharging(void) const {return false; }
 } ;
diff --git a/src/Mobs/Giant.h b/src/Mobs/Giant.h
index bf291d647..e9bda920d 100644
--- a/src/Mobs/Giant.h
+++ b/src/Mobs/Giant.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cGiant)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Horse.h b/src/Mobs/Horse.h
index e1023f3f2..f34283a80 100644
--- a/src/Mobs/Horse.h
+++ b/src/Mobs/Horse.h
@@ -17,8 +17,8 @@ public:
 
 	CLASS_PROTODEF(cHorse)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	bool IsSaddled      (void) const  {return m_bIsSaddled; }
 	bool IsChested      (void) const  {return m_bHasChest; }
diff --git a/src/Mobs/IronGolem.h b/src/Mobs/IronGolem.h
index 381bfff4d..5a024cfbc 100644
--- a/src/Mobs/IronGolem.h
+++ b/src/Mobs/IronGolem.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cIronGolem)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/MagmaCube.h b/src/Mobs/MagmaCube.h
index 28be7e77f..d27bba4d3 100644
--- a/src/Mobs/MagmaCube.h
+++ b/src/Mobs/MagmaCube.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cMagmaCube)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	int GetSize(void) const { return m_Size; }
 	
 protected:
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index bfaceece2..b410a77e0 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -77,7 +77,7 @@ protected:
 public:
 	cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 	~cMonster() { delete m_AI; delete m_Attack; delete m_Environment; delete m_Movement;}
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
 	virtual void Tick(float a_Dt, cChunk & a_Chunk);
 
@@ -101,10 +101,10 @@ public:
 	float   GetDropChanceChestplate() { return m_DropChanceChestplate; }
 	float   GetDropChanceLeggings() { return m_DropChanceLeggings; }
 	float   GetDropChanceWeapon() { return m_DropChanceWeapon; }
-	
+
 	eType  GetMobType() const { return m_MobType; }
 	eFamily GetMobFamily() { return mfPassive; }
-	
+
 
 	// Set Functions - Temporary
 	void    SetDropChanceBoots(float a_Chance) {  m_DropChanceBoots = a_Chance; }
diff --git a/src/Mobs/Mooshroom.h b/src/Mobs/Mooshroom.h
index 40ba41155..6630c57ec 100644
--- a/src/Mobs/Mooshroom.h
+++ b/src/Mobs/Mooshroom.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cMooshroom)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/AggressiveMonster.h b/src/Mobs/Old Mobs/AggressiveMonster.h
index 2c6f6b253..d70ff04a3 100644
--- a/src/Mobs/Old Mobs/AggressiveMonster.h
+++ b/src/Mobs/Old Mobs/AggressiveMonster.h
@@ -16,10 +16,10 @@ public:
 
 	cAggressiveMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 
-	virtual void Tick          (float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void InStateChasing(float a_Dt) /*override*/;
+	virtual void Tick          (float a_Dt, cChunk & a_Chunk) override;
+	virtual void InStateChasing(float a_Dt) override;
 	
-	virtual void EventSeePlayer(cEntity *) /*override*/;
+	virtual void EventSeePlayer(cEntity *) override;
 	virtual void Attack(float a_Dt);
 
 protected:
diff --git a/src/Mobs/Old Mobs/Blaze.h b/src/Mobs/Old Mobs/Blaze.h
index 66540e2f2..f283b1070 100644
--- a/src/Mobs/Old Mobs/Blaze.h
+++ b/src/Mobs/Old Mobs/Blaze.h
@@ -17,6 +17,6 @@ public:
 
 	CLASS_PROTODEF(cBlaze)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Attack(float a_Dt) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
 } ;
diff --git a/src/Mobs/Old Mobs/CaveSpider.h b/src/Mobs/Old Mobs/CaveSpider.h
index 355577d22..f9ed10e1b 100644
--- a/src/Mobs/Old Mobs/CaveSpider.h
+++ b/src/Mobs/Old Mobs/CaveSpider.h
@@ -16,9 +16,9 @@ public:
 
 	CLASS_PROTODEF(cCaveSpider)
 
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void Attack(float a_Dt) /*override*/;
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void Attack(float a_Dt) override;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/Chicken.h b/src/Mobs/Old Mobs/Chicken.h
index 2a6c4fdb5..b1a50b61c 100644
--- a/src/Mobs/Old Mobs/Chicken.h
+++ b/src/Mobs/Old Mobs/Chicken.h
@@ -16,10 +16,10 @@ public:
 
 	CLASS_PROTODEF(cChicken)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
-	virtual const cItem GetFollowedItem(void) const /*override*/ { return cItem(E_ITEM_SEEDS); }
+	virtual const cItem GetFollowedItem(void) const override { return cItem(E_ITEM_SEEDS); }
 
 private:
 
diff --git a/src/Mobs/Old Mobs/Cow.h b/src/Mobs/Old Mobs/Cow.h
index 52f468982..8814b7e09 100644
--- a/src/Mobs/Old Mobs/Cow.h
+++ b/src/Mobs/Old Mobs/Cow.h
@@ -17,10 +17,10 @@ public:
 
 	CLASS_PROTODEF(cCow)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 
-	virtual const cItem GetFollowedItem(void) const /*override*/ { return cItem(E_ITEM_WHEAT); }
+	virtual const cItem GetFollowedItem(void) const override { return cItem(E_ITEM_WHEAT); }
 
 } ;
 
diff --git a/src/Mobs/Old Mobs/Creeper.cpp b/src/Mobs/Old Mobs/Creeper.cpp
index 399710723..02718edf8 100644
--- a/src/Mobs/Old Mobs/Creeper.cpp
+++ b/src/Mobs/Old Mobs/Creeper.cpp
@@ -76,7 +76,7 @@ void cCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 			{
 			}
 
-			virtual bool Item(cEntity * a_Entity) /*override*/
+			virtual bool Item(cEntity * a_Entity) override
 			{
 				if (a_Entity->IsMob() && ((cMonster *)a_Entity)->GetMobType() == mtSkeleton)
 				{
diff --git a/src/Mobs/Old Mobs/Creeper.h b/src/Mobs/Old Mobs/Creeper.h
index fcf0d40df..747daca09 100644
--- a/src/Mobs/Old Mobs/Creeper.h
+++ b/src/Mobs/Old Mobs/Creeper.h
@@ -17,11 +17,11 @@ public:
 
 	CLASS_PROTODEF(cCreeper)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
-	virtual void Attack(float a_Dt) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+	virtual void Attack(float a_Dt) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 
 	bool IsBlowing(void) const {return m_bIsBlowing; }
 	bool IsCharged(void) const {return m_bIsCharged; }
diff --git a/src/Mobs/Old Mobs/EnderDragon.h b/src/Mobs/Old Mobs/EnderDragon.h
index b26456868..1d4cd657c 100644
--- a/src/Mobs/Old Mobs/EnderDragon.h
+++ b/src/Mobs/Old Mobs/EnderDragon.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cEnderDragon)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/Enderman.cpp b/src/Mobs/Old Mobs/Enderman.cpp
index 29f8d434c..51255beb3 100644
--- a/src/Mobs/Old Mobs/Enderman.cpp
+++ b/src/Mobs/Old Mobs/Enderman.cpp
@@ -21,7 +21,7 @@ public:
 	{
 	}
 
-	virtual bool Item(cPlayer * a_Player) /*override*/
+	virtual bool Item(cPlayer * a_Player) override
 	{
 		// Don't check players who are in creative gamemode
 		if (a_Player->IsGameModeCreative())
diff --git a/src/Mobs/Old Mobs/Enderman.h b/src/Mobs/Old Mobs/Enderman.h
index 5e61f9ac0..4583746e7 100644
--- a/src/Mobs/Old Mobs/Enderman.h
+++ b/src/Mobs/Old Mobs/Enderman.h
@@ -17,10 +17,10 @@ public:
 
 	CLASS_PROTODEF(cEnderman)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void CheckEventSeePlayer(void) /*override*/;
-	virtual void CheckEventLostPlayer(void) /*override*/;
-	virtual void EventLosePlayer(void) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void CheckEventSeePlayer(void) override;
+	virtual void CheckEventLostPlayer(void) override;
+	virtual void EventLosePlayer(void) override;
 
 	bool IsScreaming(void) const {return m_bIsScreaming; }
 	BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; }
diff --git a/src/Mobs/Old Mobs/Ghast.h b/src/Mobs/Old Mobs/Ghast.h
index 86e9ad9ba..1d4e6b94a 100644
--- a/src/Mobs/Old Mobs/Ghast.h
+++ b/src/Mobs/Old Mobs/Ghast.h
@@ -17,8 +17,8 @@ public:
 
 	CLASS_PROTODEF(cGhast)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Attack(float a_Dt) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
 
 	bool IsCharging(void) const {return false; }
 } ;
diff --git a/src/Mobs/Old Mobs/Giant.h b/src/Mobs/Old Mobs/Giant.h
index ee2d4f795..7c04c9b4f 100644
--- a/src/Mobs/Old Mobs/Giant.h
+++ b/src/Mobs/Old Mobs/Giant.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cGiant)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/Horse.h b/src/Mobs/Old Mobs/Horse.h
index 935e7c614..47189b3b0 100644
--- a/src/Mobs/Old Mobs/Horse.h
+++ b/src/Mobs/Old Mobs/Horse.h
@@ -17,9 +17,9 @@ public:
 
 	CLASS_PROTODEF(cHorse)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 
 	bool IsSaddled      (void) const  {return m_bIsSaddled; }
 	bool IsChested      (void) const  {return m_bHasChest; }
diff --git a/src/Mobs/Old Mobs/IronGolem.h b/src/Mobs/Old Mobs/IronGolem.h
index c526e1ba9..c5341ed76 100644
--- a/src/Mobs/Old Mobs/IronGolem.h
+++ b/src/Mobs/Old Mobs/IronGolem.h
@@ -17,11 +17,11 @@ public:
 
 	CLASS_PROTODEF(cIronGolem)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	// Iron golems do not drown nor float
-	virtual void HandleAir(void) /*override*/ {}
-	virtual void SetSwimState(cChunk & a_Chunk) /*override*/ {}
+	virtual void HandleAir(void) override {}
+	virtual void SetSwimState(cChunk & a_Chunk) override {}
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/MagmaCube.h b/src/Mobs/Old Mobs/MagmaCube.h
index 695f72ed2..bfe63fa2e 100644
--- a/src/Mobs/Old Mobs/MagmaCube.h
+++ b/src/Mobs/Old Mobs/MagmaCube.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cMagmaCube)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	int GetSize(void) const { return m_Size; }
 	
 protected:
diff --git a/src/Mobs/Old Mobs/Monster.h b/src/Mobs/Old Mobs/Monster.h
index f0ecc7a93..cdbd26c09 100644
--- a/src/Mobs/Old Mobs/Monster.h
+++ b/src/Mobs/Old Mobs/Monster.h
@@ -84,13 +84,13 @@ public:
 
 	CLASS_PROTODEF(cMonster)
 	
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 	virtual void MoveToPosition(const Vector3d & a_Position);  // tolua_export
 	virtual bool ReachedDestination(void);
diff --git a/src/Mobs/Old Mobs/Mooshroom.h b/src/Mobs/Old Mobs/Mooshroom.h
index 55b6ff0d9..fb002c2bf 100644
--- a/src/Mobs/Old Mobs/Mooshroom.h
+++ b/src/Mobs/Old Mobs/Mooshroom.h
@@ -17,10 +17,10 @@ public:
 
 	CLASS_PROTODEF(cMooshroom)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 
-	virtual const cItem GetFollowedItem(void) const /*override*/ { return cItem(E_ITEM_WHEAT); }
+	virtual const cItem GetFollowedItem(void) const override { return cItem(E_ITEM_WHEAT); }
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/PassiveAggressiveMonster.h b/src/Mobs/Old Mobs/PassiveAggressiveMonster.h
index 0fa5af34f..a0da50e8e 100644
--- a/src/Mobs/Old Mobs/PassiveAggressiveMonster.h
+++ b/src/Mobs/Old Mobs/PassiveAggressiveMonster.h
@@ -15,7 +15,7 @@ class cPassiveAggressiveMonster :
 public:
 	cPassiveAggressiveMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/PassiveMonster.h b/src/Mobs/Old Mobs/PassiveMonster.h
index 70033fe09..70574585a 100644
--- a/src/Mobs/Old Mobs/PassiveMonster.h
+++ b/src/Mobs/Old Mobs/PassiveMonster.h
@@ -15,10 +15,10 @@ class cPassiveMonster :
 public:
 	cPassiveMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	/// When hit by someone, run away
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	/** Returns the item that the animal of this class follows when a player holds it in hand
 	Return an empty item not to follow (default). */
 	virtual const cItem GetFollowedItem(void) const { return cItem(); }
diff --git a/src/Mobs/Old Mobs/Pig.h b/src/Mobs/Old Mobs/Pig.h
index abd2d2299..534a0ca6f 100644
--- a/src/Mobs/Old Mobs/Pig.h
+++ b/src/Mobs/Old Mobs/Pig.h
@@ -17,11 +17,11 @@ public:
 
 	CLASS_PROTODEF(cPig)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
-	virtual const cItem GetFollowedItem(void) const /*override*/ { return cItem(E_ITEM_CARROT); }
+	virtual const cItem GetFollowedItem(void) const override { return cItem(E_ITEM_CARROT); }
 
 	bool IsSaddled(void) const { return m_bIsSaddled; }
 
diff --git a/src/Mobs/Old Mobs/Sheep.h b/src/Mobs/Old Mobs/Sheep.h
index b19fca244..28e1c7254 100644
--- a/src/Mobs/Old Mobs/Sheep.h
+++ b/src/Mobs/Old Mobs/Sheep.h
@@ -22,11 +22,11 @@ public:
 
 	CLASS_PROTODEF(cSheep)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
-	virtual const cItem GetFollowedItem(void) const /*override*/ { return cItem(E_ITEM_WHEAT); }
+	virtual const cItem GetFollowedItem(void) const override { return cItem(E_ITEM_WHEAT); }
 
 	/** Generates a random color for the sheep like the vanilla server.
 	The percent's where used are from the wiki: http://minecraft.gamepedia.com/Sheep#Breeding */
diff --git a/src/Mobs/Old Mobs/Skeleton.h b/src/Mobs/Old Mobs/Skeleton.h
index 2206a5203..577588b32 100644
--- a/src/Mobs/Old Mobs/Skeleton.h
+++ b/src/Mobs/Old Mobs/Skeleton.h
@@ -17,12 +17,12 @@ public:
 
 	CLASS_PROTODEF(cSkeleton)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void MoveToPosition(const Vector3d & a_Position) /*override*/;
-	virtual void Attack(float a_Dt) /*override*/;
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void MoveToPosition(const Vector3d & a_Position) override;
+	virtual void Attack(float a_Dt) override;
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
-	virtual bool IsUndead(void) /*override*/ { return true; }
+	virtual bool IsUndead(void) override { return true; }
 	
 	bool IsWither(void) const { return m_bIsWither; }
 
diff --git a/src/Mobs/Old Mobs/Slime.h b/src/Mobs/Old Mobs/Slime.h
index 433660c22..f0b800f94 100644
--- a/src/Mobs/Old Mobs/Slime.h
+++ b/src/Mobs/Old Mobs/Slime.h
@@ -18,10 +18,10 @@ public:
 
 	CLASS_PROTODEF(cSlime)
 
-	// cAggressiveMonster /*override*/s:
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void Attack(float a_Dt) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	// cAggressiveMonster overrides:
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 
 	int GetSize(void) const { return m_Size; }
 	
diff --git a/src/Mobs/Old Mobs/SnowGolem.h b/src/Mobs/Old Mobs/SnowGolem.h
index 9ab665bc7..aba89e52d 100644
--- a/src/Mobs/Old Mobs/SnowGolem.h
+++ b/src/Mobs/Old Mobs/SnowGolem.h
@@ -17,8 +17,8 @@ public:
 
 	CLASS_PROTODEF(cSnowGolem)
 	
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/Spider.h b/src/Mobs/Old Mobs/Spider.h
index 2cf3ac0e3..813d2e266 100644
--- a/src/Mobs/Old Mobs/Spider.h
+++ b/src/Mobs/Old Mobs/Spider.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cSpider)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/Squid.h b/src/Mobs/Old Mobs/Squid.h
index 884a80de3..b57340427 100644
--- a/src/Mobs/Old Mobs/Squid.h
+++ b/src/Mobs/Old Mobs/Squid.h
@@ -15,15 +15,15 @@ class cSquid :
 public:
 	cSquid();
 
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	CLASS_PROTODEF(cSquid)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	// Squids do not drown (or float)
-	virtual void HandleAir(void) /*override*/ {}
-	virtual void SetSwimState(cChunk & a_Chunk) /*override*/ {}
+	virtual void HandleAir(void) override {}
+	virtual void SetSwimState(cChunk & a_Chunk) override {}
 } ;
 
 
diff --git a/src/Mobs/Old Mobs/Villager.h b/src/Mobs/Old Mobs/Villager.h
index 0ee24eb50..aa81f0790 100644
--- a/src/Mobs/Old Mobs/Villager.h
+++ b/src/Mobs/Old Mobs/Villager.h
@@ -29,9 +29,9 @@ public:
 
 	CLASS_PROTODEF(cVillager)
 
-	// cEntity /*override*/s
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
-	virtual void Tick        (float a_Dt, cChunk & a_Chunk) /*override*/;
+	// cEntity overrides
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+	virtual void Tick        (float a_Dt, cChunk & a_Chunk) override;
 
 	// cVillager functions
 	/** return true if the given blocktype are: crops, potatoes or carrots.*/
diff --git a/src/Mobs/Old Mobs/Witch.h b/src/Mobs/Old Mobs/Witch.h
index 18a99d053..bd059f61d 100644
--- a/src/Mobs/Old Mobs/Witch.h
+++ b/src/Mobs/Old Mobs/Witch.h
@@ -18,7 +18,7 @@ public:
 
 	CLASS_PROTODEF(cWitch)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	bool IsAngry(void) const {return ((m_EMState == ATTACKING) || (m_EMState == CHASING)); }
 } ;
diff --git a/src/Mobs/Old Mobs/Wither.h b/src/Mobs/Old Mobs/Wither.h
index 7d307c360..2403823ed 100644
--- a/src/Mobs/Old Mobs/Wither.h
+++ b/src/Mobs/Old Mobs/Wither.h
@@ -24,14 +24,14 @@ public:
 	/** Returns whether the wither is invulnerable to arrows. */
 	bool IsArmored(void) const;
 	
-	// cEntity /*override*/s
-	virtual bool Initialize(cWorld & a_World) /*override*/;
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	// cEntity overrides
+	virtual bool Initialize(cWorld & a_World) override;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 	
-	virtual bool IsUndead(void) /*override*/ { return true; }
+	virtual bool IsUndead(void) override { return true; }
 
 private:
 
diff --git a/src/Mobs/Old Mobs/Wolf.cpp b/src/Mobs/Old Mobs/Wolf.cpp
index 8b5f06f01..4fe1ff1d6 100644
--- a/src/Mobs/Old Mobs/Wolf.cpp
+++ b/src/Mobs/Old Mobs/Wolf.cpp
@@ -216,7 +216,7 @@ void cWolf::TickFollowPlayer()
 	class cCallback :
 		public cPlayerListCallback
 	{
-		virtual bool Item(cPlayer * a_Player) /*override*/
+		virtual bool Item(cPlayer * a_Player) override
 		{
 			OwnerPos = a_Player->GetPosition();
 			return false;
diff --git a/src/Mobs/Old Mobs/Wolf.h b/src/Mobs/Old Mobs/Wolf.h
index 0ecb9d1f4..7500854f8 100644
--- a/src/Mobs/Old Mobs/Wolf.h
+++ b/src/Mobs/Old Mobs/Wolf.h
@@ -18,11 +18,11 @@ public:
 
 	CLASS_PROTODEF(cWolf)
 
-	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) /*override*/;
-	virtual void OnRightClicked(cPlayer & a_Player) /*override*/;
-	virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
+	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void TickFollowPlayer();
-	virtual void Attack(float a_Dt) /*override*/;
+	virtual void Attack(float a_Dt) override;
 
 	// Get functions
 	bool    IsSitting     (void) const { return m_IsSitting; }
diff --git a/src/Mobs/Old Mobs/Zombie.h b/src/Mobs/Old Mobs/Zombie.h
index 458945c3f..118b6e6e7 100644
--- a/src/Mobs/Old Mobs/Zombie.h
+++ b/src/Mobs/Old Mobs/Zombie.h
@@ -16,10 +16,10 @@ public:
 
 	CLASS_PROTODEF(cZombie)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void MoveToPosition(const Vector3d & a_Position) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void MoveToPosition(const Vector3d & a_Position) override;
 
-	virtual bool IsUndead(void) /*override*/ { return true; }
+	virtual bool IsUndead(void) override { return true; }
 	
 	bool IsVillagerZombie(void) const { return m_IsVillagerZombie; }
 	bool IsConverting    (void) const { return m_IsConverting; }
diff --git a/src/Mobs/Old Mobs/ZombiePigman.h b/src/Mobs/Old Mobs/ZombiePigman.h
index 861d05385..bae0115eb 100644
--- a/src/Mobs/Old Mobs/ZombiePigman.h
+++ b/src/Mobs/Old Mobs/ZombiePigman.h
@@ -16,10 +16,10 @@ public:
 
 	CLASS_PROTODEF(cZombiePigman)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
-	virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void KilledBy(TakeDamageInfo & a_TDI) override;
 	
-	virtual bool IsUndead(void) /*override*/ { return true; }
+	virtual bool IsUndead(void) override { return true; }
 } ;
 
 
diff --git a/src/Mobs/Pig.h b/src/Mobs/Pig.h
index 0d62b085e..480acc477 100644
--- a/src/Mobs/Pig.h
+++ b/src/Mobs/Pig.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cPig)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	bool IsSaddled(void) const { return m_bIsSaddled; }
 
diff --git a/src/Mobs/Sheep.h b/src/Mobs/Sheep.h
index 4b65d2636..8bcfddab6 100644
--- a/src/Mobs/Sheep.h
+++ b/src/Mobs/Sheep.h
@@ -22,7 +22,7 @@ public:
 
 	CLASS_PROTODEF(cSheep)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	/** Generates a random color for the sheep like the vanilla server.
 	The percent's where used are from the wiki: http://minecraft.gamepedia.com/Sheep#Breeding */
diff --git a/src/Mobs/Skeleton.h b/src/Mobs/Skeleton.h
index 1b0216ad2..683a54705 100644
--- a/src/Mobs/Skeleton.h
+++ b/src/Mobs/Skeleton.h
@@ -17,8 +17,8 @@ public:
 
 	CLASS_PROTODEF(cSkeleton)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;\
-	virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;\
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 	
 	bool IsWither(void) const { return m_bIsWither; }
 
diff --git a/src/Mobs/Slime.h b/src/Mobs/Slime.h
index 2e8266523..e093a8109 100644
--- a/src/Mobs/Slime.h
+++ b/src/Mobs/Slime.h
@@ -18,8 +18,8 @@ public:
 
 	CLASS_PROTODEF(cSlime)
 
-	// cAggressiveMonster /*override*/s:
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	// cAggressiveMonster overrides:
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	int GetSize(void) const { return m_Size; }
 	
diff --git a/src/Mobs/SnowGolem.h b/src/Mobs/SnowGolem.h
index d61c0ade5..f5665b864 100644
--- a/src/Mobs/SnowGolem.h
+++ b/src/Mobs/SnowGolem.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cSnowGolem)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Spider.h b/src/Mobs/Spider.h
index 1eafae764..2799bacc7 100644
--- a/src/Mobs/Spider.h
+++ b/src/Mobs/Spider.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cSpider)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Squid.h b/src/Mobs/Squid.h
index 30f3afe23..edae5a16c 100644
--- a/src/Mobs/Squid.h
+++ b/src/Mobs/Squid.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cSquid)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/Mobs/Witch.h b/src/Mobs/Witch.h
index 376d9b9c9..f92db79d6 100644
--- a/src/Mobs/Witch.h
+++ b/src/Mobs/Witch.h
@@ -18,7 +18,7 @@ public:
 
 	CLASS_PROTODEF(cWitch)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 	bool IsAngry(void) const {return false; }
 } ;
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index 409419efb..b0d1f4a3d 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -22,9 +22,9 @@ public:
 	int GetWitherInvulnerableTicks() const { return m_WitherInvulnerableTicks; }
 	void SetWitherInvulnerableTicks(unsigned int a_Ticks) { m_WitherInvulnerableTicks = a_Ticks; }
 	
-	// cEntity /*override*/s
-	virtual bool Initialize(cWorld & a_World) /*override*/;
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	// cEntity overrides
+	virtual bool Initialize(cWorld & a_World) override;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
 private:
 
diff --git a/src/Mobs/Zombie.h b/src/Mobs/Zombie.h
index 364c54a0a..e3f499c64 100644
--- a/src/Mobs/Zombie.h
+++ b/src/Mobs/Zombie.h
@@ -16,7 +16,7 @@ public:
 
 	CLASS_PROTODEF(cZombie)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	
 	bool IsVillagerZombie(void) const { return m_IsVillagerZombie; }
 	bool IsConverting    (void) const { return m_IsConverting; }
diff --git a/src/Mobs/ZombiePigman.h b/src/Mobs/ZombiePigman.h
index 39c6e23fe..0e7d77c2d 100644
--- a/src/Mobs/ZombiePigman.h
+++ b/src/Mobs/ZombiePigman.h
@@ -16,7 +16,7 @@ public:
 
 	CLASS_PROTODEF(cZombiePigman)
 
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
diff --git a/src/OSSupport/ListenThread.h b/src/OSSupport/ListenThread.h
index 776b84e0e..b2d806c82 100644
--- a/src/OSSupport/ListenThread.h
+++ b/src/OSSupport/ListenThread.h
@@ -76,8 +76,8 @@ protected:
 	*/
 	bool CreateSockets(const AString & a_PortsString);
 	
-	// cIsThread /*override*/:
-	virtual void Execute(void) /*override*/;
+	// cIsThread override:
+	virtual void Execute(void) override;
 } ;
 
 
diff --git a/src/OSSupport/SocketThreads.h b/src/OSSupport/SocketThreads.h
index e19a72409..944f5f3bc 100644
--- a/src/OSSupport/SocketThreads.h
+++ b/src/OSSupport/SocketThreads.h
@@ -157,7 +157,7 @@ private:
 		sSlot m_Slots[MAX_SLOTS];
 		int   m_NumSlots;  // Number of slots actually used
 		
-		virtual void Execute(void) /*override*/;
+		virtual void Execute(void) override;
 		
 		/** Prepares the Read and Write socket sets for select()
 		Puts all sockets into the read set, along with m_ControlSocket1.
diff --git a/src/PolarSSL++/BlockingSslClientSocket.h b/src/PolarSSL++/BlockingSslClientSocket.h
index 9eb53da91..7af897582 100644
--- a/src/PolarSSL++/BlockingSslClientSocket.h
+++ b/src/PolarSSL++/BlockingSslClientSocket.h
@@ -70,9 +70,9 @@ protected:
 	bool m_IsConnected;
 	
 	
-	// cCallbackSslContext::cDataCallbacks /*override*/s:
-	virtual int ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes) /*override*/;
-	virtual int SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes) /*override*/;
+	// cCallbackSslContext::cDataCallbacks overrides:
+	virtual int ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes) override;
+	virtual int SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes) override;
 } ;
 
 
diff --git a/src/PolarSSL++/BufferedSslContext.h b/src/PolarSSL++/BufferedSslContext.h
index c84c16772..1b7e1af46 100644
--- a/src/PolarSSL++/BufferedSslContext.h
+++ b/src/PolarSSL++/BufferedSslContext.h
@@ -42,9 +42,9 @@ protected:
 	cByteBuffer m_IncomingData;
 	
 
-	// cSslContext /*override*/s:
-	virtual int ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes) /*override*/;
-	virtual int SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes) /*override*/;
+	// cSslContext overrides:
+	virtual int ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes) override;
+	virtual int SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes) override;
 } ;
 
 
diff --git a/src/PolarSSL++/CallbackSslContext.h b/src/PolarSSL++/CallbackSslContext.h
index 34be7158c..3e6edc5f4 100644
--- a/src/PolarSSL++/CallbackSslContext.h
+++ b/src/PolarSSL++/CallbackSslContext.h
@@ -54,9 +54,9 @@ protected:
 	/** The callbacks to use to send and receive SSL peer data */
 	cDataCallbacks * m_Callbacks;
 
-	// cSslContext /*override*/s:
-	virtual int ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes) /*override*/;
-	virtual int SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes) /*override*/;
+	// cSslContext overrides:
+	virtual int ReceiveEncrypted(unsigned char * a_Buffer, size_t a_NumBytes) override;
+	virtual int SendEncrypted(const unsigned char * a_Buffer, size_t a_NumBytes) override;
 };
 
 
diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h
index b3bae5417..853eff535 100644
--- a/src/Protocol/Authenticator.h
+++ b/src/Protocol/Authenticator.h
@@ -87,7 +87,7 @@ private:
 	bool    m_ShouldAuthenticate;
 
 	/** cIsThread override: */
-	virtual void Execute(void) /*override*/;
+	virtual void Execute(void) override;
 
 	/** Returns true if the user authenticated okay, false on error
 	Returns the case-corrected username, UUID, and properties (eg. skin). */
diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h
index 2e10d8a5b..8e1842ec1 100644
--- a/src/Protocol/Protocol.h
+++ b/src/Protocol/Protocol.h
@@ -134,7 +134,7 @@ protected:
 	cClientHandle * m_Client;
 	cCriticalSection m_CSPacket;  // Each SendXYZ() function must acquire this CS in order to send the whole packet at once
 	
-	/// A generic data-sending routine, all outgoing packet data needs to be routed through this so that descendants may /*override*/ it
+	/// A generic data-sending routine, all outgoing packet data needs to be routed through this so that descendants may override it
 	virtual void SendData(const char * a_Data, size_t a_Size) = 0;
 	
 	/// Called after writing each packet, enables descendants to flush their buffers
diff --git a/src/Protocol/Protocol125.h b/src/Protocol/Protocol125.h
index 254360533..1063777a2 100644
--- a/src/Protocol/Protocol125.h
+++ b/src/Protocol/Protocol125.h
@@ -25,81 +25,81 @@ public:
 	cProtocol125(cClientHandle * a_Client);
 	
 	/// Called when client sends some data:
-	virtual void DataReceived(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	/// Sending stuff to clients (alphabetically sorted):
-	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) /*override*/;
-	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) /*override*/;
-	virtual void SendBlockBreakAnim	     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) /*override*/;
-	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) /*override*/;
-	virtual void SendChat                (const AString & a_Message) /*override*/;
-	virtual void SendChat                (const cCompositeChat & a_Message) /*override*/;
-	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) /*override*/;
-	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) /*override*/;
-	virtual void SendDestroyEntity       (const cEntity & a_Entity) /*override*/;
-	virtual void SendDisconnect          (const AString & a_Reason) /*override*/;
-	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) /*override*/;
-	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendEntityHeadLook      (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityLook          (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityMetadata      (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityProperties    (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) /*override*/;
-	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) /*override*/;
-	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) /*override*/;
-	virtual void SendEntityVelocity      (const cEntity & a_Entity) /*override*/;
-	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) /*override*/;
-	virtual void SendGameMode            (eGameMode a_GameMode) /*override*/;
-	virtual void SendHealth              (void) /*override*/;
-	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendKeepAlive           (int a_PingID) /*override*/;
-	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) /*override*/;
-	virtual void SendLoginSuccess        (void) /*override*/;
-	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) /*override*/;
-	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) /*override*/;
-	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) /*override*/;
-	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) /*override*/;
-	virtual void SendPaintingSpawn       (const cPainting & a_Painting) /*override*/;
-	virtual void SendPickupSpawn         (const cPickup & a_Pickup) /*override*/;
-	virtual void SendPlayerAbilities     (void) /*override*/ {}  // This protocol doesn't support such message
-	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) /*override*/;
-	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) /*override*/;
-	virtual void SendPlayerMaxSpeed      (void) /*override*/;
-	virtual void SendPlayerMoveLook      (void) /*override*/;
-	virtual void SendPlayerPosition      (void) /*override*/;
-	virtual void SendPlayerSpawn         (const cPlayer & a_Player) /*override*/;
-	virtual void SendPluginMessage       (const AString & a_Channel, const AString & a_Message) /*override*/;
-	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) /*override*/;
-	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) /*override*/;
-	virtual void SendExperience          (void) /*override*/;
-	virtual void SendExperienceOrb       (const cExpOrb &  a_ExpOrb) /*override*/;
-	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) /*override*/;
-	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) /*override*/ {}  // This protocol doesn't support such message
-	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display)                              /*override*/ {}  // This protocol doesn't support such message
-	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) /*override*/;
-	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) /*override*/;
-	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) /*override*/;
-	virtual void SendSpawnMob            (const cMonster & a_Mob) /*override*/;
-	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) /*override*/;
-	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) /*override*/;
-	virtual void SendStatistics          (const cStatManager & a_Manager) /*override*/;
-	virtual void SendTabCompletionResults(const AStringVector & a_Results) /*override*/;
-	virtual void SendTeleportEntity      (const cEntity & a_Entity) /*override*/;
-	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) /*override*/;
-	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) /*override*/ {}
-	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) /*override*/;
-	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void SendWeather             (eWeather a_Weather) /*override*/;
-	virtual void SendWholeInventory      (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowClose         (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowOpen          (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) /*override*/;
+	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim	     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
+	virtual void SendChat                (const AString & a_Message) override;
+	virtual void SendChat                (const cCompositeChat & a_Message) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendDisconnect          (const AString & a_Reason) override;
+	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) override;
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendEntityHeadLook      (const cEntity & a_Entity) override;
+	virtual void SendEntityLook          (const cEntity & a_Entity) override;
+	virtual void SendEntityMetadata      (const cEntity & a_Entity) override;
+	virtual void SendEntityProperties    (const cEntity & a_Entity) override;
+	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) override;
+	virtual void SendEntityVelocity      (const cEntity & a_Entity) override;
+	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
+	virtual void SendGameMode            (eGameMode a_GameMode) override;
+	virtual void SendHealth              (void) override;
+	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendKeepAlive           (int a_PingID) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendLoginSuccess        (void) override;
+	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) override;
+	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) override;
+	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) override;
+	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) override;
+	virtual void SendPaintingSpawn       (const cPainting & a_Painting) override;
+	virtual void SendPickupSpawn         (const cPickup & a_Pickup) override;
+	virtual void SendPlayerAbilities     (void) override {}  // This protocol doesn't support such message
+	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) override;
+	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) override;
+	virtual void SendPlayerMaxSpeed      (void) override;
+	virtual void SendPlayerMoveLook      (void) override;
+	virtual void SendPlayerPosition      (void) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendPluginMessage       (const AString & a_Channel, const AString & a_Message) override;
+	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) override;
+	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) override;
+	virtual void SendExperience          (void) override;
+	virtual void SendExperienceOrb       (const cExpOrb &  a_ExpOrb) override;
+	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override;
+	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) override {}  // This protocol doesn't support such message
+	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display)                              override {}  // This protocol doesn't support such message
+	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
+	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) override;
+	virtual void SendStatistics          (const cStatManager & a_Manager) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendTeleportEntity      (const cEntity & a_Entity) override;
+	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) override {}
+	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
+	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendWeather             (eWeather a_Weather) override;
+	virtual void SendWholeInventory      (const cWindow & a_Window) override;
+	virtual void SendWindowClose         (const cWindow & a_Window) override;
+	virtual void SendWindowOpen          (const cWindow & a_Window) override;
+	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) override;
 	
-	virtual AString GetAuthServerID(void) /*override*/;
+	virtual AString GetAuthServerID(void) override;
 	
 protected:
 	/// Results of packet-parsing:
@@ -119,7 +119,7 @@ protected:
 	Used to avoid Respawning into the same dimension, which confuses the client. */
 	eDimension m_LastSentDimension;
 	
-	virtual void SendData(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 	
 	/// Sends the Handshake packet
 	void SendHandshake(const AString & a_ConnectionHash);
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h
index 144d560fd..1124a7253 100644
--- a/src/Protocol/Protocol132.h
+++ b/src/Protocol/Protocol132.h
@@ -41,35 +41,35 @@ public:
 	virtual ~cProtocol132();
 
 	/// Called when client sends some data:
-	virtual void DataReceived(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	// Sending commands (alphabetically sorted):
-	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) /*override*/;
-	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) /*override*/;
-	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) /*override*/;
-	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) /*override*/;
-	virtual void SendDestroyEntity       (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) /*override*/;
-	virtual void SendPlayerSpawn         (const cPlayer & a_Player) /*override*/;
-	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) /*override*/;
-	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) /*override*/;
-	virtual void SendSpawnMob            (const cMonster & a_Mob) /*override*/;
-	virtual void SendTabCompletionResults(const AStringVector & a_Results) /*override*/;
-	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual void SendWholeInventory      (const cWindow & a_Window) /*override*/;
-
-	virtual AString GetAuthServerID(void) /*override*/;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendWholeInventory      (const cWindow & a_Window) override;
+
+	virtual AString GetAuthServerID(void) override;
 
 	/// Handling of the additional packets:
-	virtual int ParsePacket(unsigned char a_PacketType) /*override*/;
+	virtual int ParsePacket(unsigned char a_PacketType) override;
 	
 	// Modified packets:
-	virtual int ParseBlockPlace     (void) /*override*/;
-	virtual int ParseHandshake      (void) /*override*/;
-	virtual int ParseLogin          (void) /*override*/;
-	virtual int ParsePlayerAbilities(void) /*override*/;
+	virtual int ParseBlockPlace     (void) override;
+	virtual int ParseHandshake      (void) override;
+	virtual int ParseLogin          (void) override;
+	virtual int ParsePlayerAbilities(void) override;
 	
 	// New packets:
 	virtual int ParseClientStatuses       (void);
@@ -88,14 +88,14 @@ protected:
 	/// The ServerID used for session authentication; set in StartEncryption(), used in GetAuthServerID()
 	AString m_AuthServerID;
 	
-	virtual void SendData(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 	
 	// DEBUG:
-	virtual void Flush(void) /*override*/;
+	virtual void Flush(void) override;
 	
 	// Items in slots are sent differently
-	virtual void WriteItem(const cItem & a_Item) /*override*/;
-	virtual int  ParseItem(cItem & a_Item) /*override*/;
+	virtual void WriteItem(const cItem & a_Item) override;
+	virtual int  ParseItem(cItem & a_Item) override;
 	
 	/// Parses the metadata that may come with the item.
 	int ParseItemMetadata(cItem & a_Item, const AString & a_Metadata);
diff --git a/src/Protocol/Protocol14x.h b/src/Protocol/Protocol14x.h
index 234c1a39e..227cc8cc7 100644
--- a/src/Protocol/Protocol14x.h
+++ b/src/Protocol/Protocol14x.h
@@ -32,12 +32,12 @@ public:
 	cProtocol142(cClientHandle * a_Client);
 
 	// Sending commands (alphabetically sorted):
-	virtual void SendPickupSpawn        (const cPickup & a_Pickup) /*override*/;
-	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) /*override*/;
-	virtual void SendTimeUpdate         (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) /*override*/;
+	virtual void SendPickupSpawn        (const cPickup & a_Pickup) override;
+	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendTimeUpdate         (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) override;
 
 	// Specific packet parsers:
-	virtual int ParseLocaleViewDistance(void) /*override*/;
+	virtual int ParseLocaleViewDistance(void) override;
 } ;
 
 
@@ -52,10 +52,10 @@ class cProtocol146 :
 public:
 	cProtocol146(cClientHandle * a_Client);
 	
-	virtual void SendPickupSpawn      (const cPickup & a_Pickup) /*override*/;
-	virtual void SendSpawnFallingBlock(const cFallingBlock & a_FallingBlock) /*override*/;
-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) /*override*/;
-	virtual void SendSpawnVehicle     (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) /*override*/;
+	virtual void SendPickupSpawn      (const cPickup & a_Pickup) override;
+	virtual void SendSpawnFallingBlock(const cFallingBlock & a_FallingBlock) override;
+	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
+	virtual void SendSpawnVehicle     (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) override;
 } ;
 
 
diff --git a/src/Protocol/Protocol15x.h b/src/Protocol/Protocol15x.h
index 9579e6cdc..0d171a67c 100644
--- a/src/Protocol/Protocol15x.h
+++ b/src/Protocol/Protocol15x.h
@@ -28,11 +28,11 @@ class cProtocol150 :
 public:
 	cProtocol150(cClientHandle * a_Client);
 	
-	virtual void SendWindowOpen          (const cWindow & a_Window) /*override*/;
-	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) /*override*/;
-	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) /*override*/;
-	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) /*override*/;
-	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) /*override*/;
+	virtual void SendWindowOpen          (const cWindow & a_Window) override;
+	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) override;
+	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override;
+	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) override;
+	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) override;
 
 	virtual int ParseWindowClick(void);
 } ;
diff --git a/src/Protocol/Protocol16x.h b/src/Protocol/Protocol16x.h
index 68d548eb5..add761d1e 100644
--- a/src/Protocol/Protocol16x.h
+++ b/src/Protocol/Protocol16x.h
@@ -34,26 +34,26 @@ public:
 	
 protected:
 
-	// cProtocol150 /*override*/s:
-	virtual void SendAttachEntity  (const cEntity & a_Entity, const cEntity * a_Vehicle) /*override*/;
-	virtual void SendChat          (const AString & a_Message) /*override*/;
-	virtual void SendChat          (const cCompositeChat & a_Message) /*override*/;
-	virtual void SendEditSign      (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendGameMode      (eGameMode a_GameMode) /*override*/;
-	virtual void SendHealth        (void) /*override*/;
-	virtual void SendPlayerMaxSpeed(void) /*override*/;
-	virtual void SendRespawn       (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) /*override*/;
-	virtual void SendWindowOpen    (const cWindow & a_Window) /*override*/;
+	// cProtocol150 overrides:
+	virtual void SendAttachEntity  (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
+	virtual void SendChat          (const AString & a_Message) override;
+	virtual void SendChat          (const cCompositeChat & a_Message) override;
+	virtual void SendEditSign      (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendGameMode      (eGameMode a_GameMode) override;
+	virtual void SendHealth        (void) override;
+	virtual void SendPlayerMaxSpeed(void) override;
+	virtual void SendRespawn       (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) override;
+	virtual void SendWindowOpen    (const cWindow & a_Window) override;
 	
-	virtual int ParseEntityAction   (void) /*override*/;
-	virtual int ParseLogin          (void) /*override*/;
-	virtual int ParsePlayerAbilities(void) /*override*/;
+	virtual int ParseEntityAction   (void) override;
+	virtual int ParseLogin          (void) override;
+	virtual int ParsePlayerAbilities(void) override;
 	
 	// New packets:
 	virtual int ParseSteerVehicle(void);
 
 	// Enable new packets' handling
-	virtual int ParsePacket(unsigned char a_PacketType) /*override*/;
+	virtual int ParsePacket(unsigned char a_PacketType) override;
 } ;
 
 
@@ -69,8 +69,8 @@ public:
 	cProtocol162(cClientHandle * a_Client);
 
 protected:
-	// cProtocol161 /*override*/s:
-	virtual void SendPlayerMaxSpeed(void) /*override*/;
+	// cProtocol161 overrides:
+	virtual void SendPlayerMaxSpeed(void) override;
 } ;
 
 
diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h
index 2ebd51d12..ccfa19eb6 100644
--- a/src/Protocol/Protocol17x.h
+++ b/src/Protocol/Protocol17x.h
@@ -57,81 +57,81 @@ public:
 	cProtocol172(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 	
 	/** Called when client sends some data: */
-	virtual void DataReceived(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 
 	/** Sending stuff to clients (alphabetically sorted): */
-	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) /*override*/;
-	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) /*override*/;
-	virtual void SendBlockBreakAnim	     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) /*override*/;
-	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) /*override*/;
-	virtual void SendChat                (const AString & a_Message) /*override*/;
-	virtual void SendChat                (const cCompositeChat & a_Message) /*override*/;
-	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) /*override*/;
-	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) /*override*/;
-	virtual void SendDestroyEntity       (const cEntity & a_Entity) /*override*/;
-	virtual void SendDisconnect          (const AString & a_Reason) /*override*/;
-	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) /*override*/;
-	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendEntityHeadLook      (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityLook          (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityMetadata      (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityProperties    (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) /*override*/;
-	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) /*override*/;
-	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) /*override*/;
-	virtual void SendEntityVelocity      (const cEntity & a_Entity) /*override*/;
-	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) /*override*/;
-	virtual void SendGameMode            (eGameMode a_GameMode) /*override*/;
-	virtual void SendHealth              (void) /*override*/;
-	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendKeepAlive           (int a_PingID) /*override*/;
-	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) /*override*/;
-	virtual void SendLoginSuccess        (void) /*override*/;
-	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) /*override*/;
-	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) /*override*/;
-	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) /*override*/;
-	virtual void SendPaintingSpawn       (const cPainting & a_Painting) /*override*/;
-	virtual void SendPickupSpawn         (const cPickup & a_Pickup) /*override*/;
-	virtual void SendPlayerAbilities     (void) /*override*/;
-	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) /*override*/;
-	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) /*override*/;
-	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) /*override*/;
-	virtual void SendPlayerMaxSpeed      (void) /*override*/;
-	virtual void SendPlayerMoveLook      (void) /*override*/;
-	virtual void SendPlayerPosition      (void) /*override*/;
-	virtual void SendPlayerSpawn         (const cPlayer & a_Player) /*override*/;
-	virtual void SendPluginMessage       (const AString & a_Channel, const AString & a_Message) /*override*/;
-	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) /*override*/;
-	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) /*override*/;
-	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) /*override*/;
-	virtual void SendExperience          (void) /*override*/;
-	virtual void SendExperienceOrb       (const cExpOrb & a_ExpOrb) /*override*/;
-	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) /*override*/;
-	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) /*override*/;
-	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) /*override*/;
-	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) /*override*/;
-	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) /*override*/;
-	virtual void SendSpawnMob            (const cMonster & a_Mob) /*override*/;
-	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) /*override*/;
-	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) /*override*/;
-	virtual void SendStatistics          (const cStatManager & a_Manager) /*override*/;
-	virtual void SendTabCompletionResults(const AStringVector & a_Results) /*override*/;
-	virtual void SendTeleportEntity      (const cEntity & a_Entity) /*override*/;
-	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) /*override*/;
-	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) /*override*/;
-	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) /*override*/;
-	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void SendWeather             (eWeather a_Weather) /*override*/;
-	virtual void SendWholeInventory      (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowClose         (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowOpen          (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) /*override*/;
-
-	virtual AString GetAuthServerID(void) /*override*/ { return m_AuthServerID; }
+	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim	     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
+	virtual void SendChat                (const AString & a_Message) override;
+	virtual void SendChat                (const cCompositeChat & a_Message) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendDisconnect          (const AString & a_Reason) override;
+	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) override;
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendEntityHeadLook      (const cEntity & a_Entity) override;
+	virtual void SendEntityLook          (const cEntity & a_Entity) override;
+	virtual void SendEntityMetadata      (const cEntity & a_Entity) override;
+	virtual void SendEntityProperties    (const cEntity & a_Entity) override;
+	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) override;
+	virtual void SendEntityVelocity      (const cEntity & a_Entity) override;
+	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
+	virtual void SendGameMode            (eGameMode a_GameMode) override;
+	virtual void SendHealth              (void) override;
+	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendKeepAlive           (int a_PingID) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendLoginSuccess        (void) override;
+	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) override;
+	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) override;
+	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) override;
+	virtual void SendPaintingSpawn       (const cPainting & a_Painting) override;
+	virtual void SendPickupSpawn         (const cPickup & a_Pickup) override;
+	virtual void SendPlayerAbilities     (void) override;
+	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) override;
+	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) override;
+	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) override;
+	virtual void SendPlayerMaxSpeed      (void) override;
+	virtual void SendPlayerMoveLook      (void) override;
+	virtual void SendPlayerPosition      (void) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendPluginMessage       (const AString & a_Channel, const AString & a_Message) override;
+	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) override;
+	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) override;
+	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;
+	virtual void SendExperience          (void) override;
+	virtual void SendExperienceOrb       (const cExpOrb & a_ExpOrb) override;
+	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override;
+	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) override;
+	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) override;
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
+	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) override;
+	virtual void SendStatistics          (const cStatManager & a_Manager) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendTeleportEntity      (const cEntity & a_Entity) override;
+	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) override;
+	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
+	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendWeather             (eWeather a_Weather) override;
+	virtual void SendWholeInventory      (const cWindow & a_Window) override;
+	virtual void SendWindowClose         (const cWindow & a_Window) override;
+	virtual void SendWindowOpen          (const cWindow & a_Window) override;
+	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) override;
+
+	virtual AString GetAuthServerID(void) override { return m_AuthServerID; }
 
 protected:
 
@@ -295,7 +295,7 @@ protected:
 	void WritePacket(cByteBuffer & a_Packet);
 
 	/** Sends the data to the client, encrypting them if needed. */
-	virtual void SendData(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 
 	void SendCompass(const cWorld & a_World);
 	
@@ -324,9 +324,9 @@ class cProtocol176 :
 public:
 	cProtocol176(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 	
-	// cProtocol172 /*override*/s:
-	virtual void SendPlayerSpawn(const cPlayer & a_Player) /*override*/;
-	virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) /*override*/;
+	// cProtocol172 overrides:
+	virtual void SendPlayerSpawn(const cPlayer & a_Player) override;
+	virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override;
 
 } ;
 
diff --git a/src/Protocol/ProtocolRecognizer.h b/src/Protocol/ProtocolRecognizer.h
index 206d30e1f..a05aeda70 100644
--- a/src/Protocol/ProtocolRecognizer.h
+++ b/src/Protocol/ProtocolRecognizer.h
@@ -60,83 +60,83 @@ public:
 	static AString GetVersionTextFromInt(int a_ProtocolVersion);
 	
 	/// Called when client sends some data:
-	virtual void DataReceived(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	/// Sending stuff to clients (alphabetically sorted):
-	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) /*override*/;
-	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) /*override*/;
-	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) /*override*/;
-	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/;
-	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) /*override*/;
-	virtual void SendChat                (const AString & a_Message) /*override*/;
-	virtual void SendChat                (const cCompositeChat & a_Message) /*override*/;
-	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) /*override*/;
-	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) /*override*/;
-	virtual void SendDestroyEntity       (const cEntity & a_Entity) /*override*/;
-	virtual void SendDisconnect          (const AString & a_Reason) /*override*/;
-	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;  ///< Request the client to open up the sign editor for the sign (1.6+)
-	virtual void SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) /*override*/;
-	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendEntityHeadLook      (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityLook          (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityMetadata      (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityProperties    (const cEntity & a_Entity) /*override*/;
-	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) /*override*/;
-	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) /*override*/;
-	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) /*override*/;
-	virtual void SendEntityVelocity      (const cEntity & a_Entity) /*override*/;
-	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) /*override*/;
-	virtual void SendGameMode            (eGameMode a_GameMode) /*override*/;
-	virtual void SendHealth              (void) /*override*/;
-	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) /*override*/;
-	virtual void SendKeepAlive           (int a_PingID) /*override*/;
-	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) /*override*/;
-	virtual void SendLoginSuccess        (void) /*override*/;
-	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) /*override*/;
-	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) /*override*/;
-	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) /*override*/;
-	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) /*override*/;
-	virtual void SendPaintingSpawn       (const cPainting & a_Painting) /*override*/;
-	virtual void SendPickupSpawn         (const cPickup & a_Pickup) /*override*/;
-	virtual void SendPlayerAbilities     (void) /*override*/;
-	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) /*override*/;
-	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) /*override*/;
-	virtual void SendPlayerMaxSpeed      (void) /*override*/;
-	virtual void SendPlayerMoveLook      (void) /*override*/;
-	virtual void SendPlayerPosition      (void) /*override*/;
-	virtual void SendPlayerSpawn         (const cPlayer & a_Player) /*override*/;
-	virtual void SendPluginMessage       (const AString & a_Channel, const AString & a_Message) /*override*/;
-	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) /*override*/;
-	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) /*override*/;
-	virtual void SendExperience          (void) /*override*/;
-	virtual void SendExperienceOrb       (const cExpOrb & a_ExpOrb) /*override*/;
-	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) /*override*/;
-	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) /*override*/;
-	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) /*override*/;
-	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) /*override*/;
-	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) /*override*/;
-	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) /*override*/;
-	virtual void SendSpawnMob            (const cMonster & a_Mob) /*override*/;
-	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) /*override*/;
-	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) /*override*/;
-	virtual void SendStatistics          (const cStatManager & a_Manager) /*override*/;
-	virtual void SendTabCompletionResults(const AStringVector & a_Results) /*override*/;
-	virtual void SendTeleportEntity      (const cEntity & a_Entity) /*override*/;
-	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) /*override*/;
-	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) /*override*/;
-	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) /*override*/;
-	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) /*override*/;
-	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
-	virtual void SendWeather             (eWeather a_Weather) /*override*/;
-	virtual void SendWholeInventory      (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowClose         (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowOpen          (const cWindow & a_Window) /*override*/;
-	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) /*override*/;
+	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
+	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;
+	virtual void SendBlockBreakAnim      (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;
+	virtual void SendBlockChange         (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
+	virtual void SendBlockChanges        (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
+	virtual void SendChat                (const AString & a_Message) override;
+	virtual void SendChat                (const cCompositeChat & a_Message) override;
+	virtual void SendChunkData           (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;
+	virtual void SendCollectEntity       (const cEntity & a_Entity, const cPlayer & a_Player) override;
+	virtual void SendDestroyEntity       (const cEntity & a_Entity) override;
+	virtual void SendDisconnect          (const AString & a_Reason) override;
+	virtual void SendEditSign            (int a_BlockX, int a_BlockY, int a_BlockZ) override;  ///< Request the client to open up the sign editor for the sign (1.6+)
+	virtual void SendEntityEffect        (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration) override;
+	virtual void SendEntityEquipment     (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendEntityHeadLook      (const cEntity & a_Entity) override;
+	virtual void SendEntityLook          (const cEntity & a_Entity) override;
+	virtual void SendEntityMetadata      (const cEntity & a_Entity) override;
+	virtual void SendEntityProperties    (const cEntity & a_Entity) override;
+	virtual void SendEntityRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;
+	virtual void SendEntityStatus        (const cEntity & a_Entity, char a_Status) override;
+	virtual void SendEntityVelocity      (const cEntity & a_Entity) override;
+	virtual void SendExplosion           (double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) override;
+	virtual void SendGameMode            (eGameMode a_GameMode) override;
+	virtual void SendHealth              (void) override;
+	virtual void SendInventorySlot       (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;
+	virtual void SendKeepAlive           (int a_PingID) override;
+	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
+	virtual void SendLoginSuccess        (void) override;
+	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) override;
+	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) override;
+	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) override;
+	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) override;
+	virtual void SendPaintingSpawn       (const cPainting & a_Painting) override;
+	virtual void SendPickupSpawn         (const cPickup & a_Pickup) override;
+	virtual void SendPlayerAbilities     (void) override;
+	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) override;
+	virtual void SendPlayerListItem      (const cPlayer & a_Player, bool a_IsOnline) override;
+	virtual void SendPlayerMaxSpeed      (void) override;
+	virtual void SendPlayerMoveLook      (void) override;
+	virtual void SendPlayerPosition      (void) override;
+	virtual void SendPlayerSpawn         (const cPlayer & a_Player) override;
+	virtual void SendPluginMessage       (const AString & a_Channel, const AString & a_Message) override;
+	virtual void SendRemoveEntityEffect  (const cEntity & a_Entity, int a_EffectID) override;
+	virtual void SendRespawn             (eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks) override;
+	virtual void SendExperience          (void) override;
+	virtual void SendExperienceOrb       (const cExpOrb & a_ExpOrb) override;
+	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override;
+	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) override;
+	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display) override;
+	virtual void SendSoundEffect         (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;
+	virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;
+	virtual void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock) override;
+	virtual void SendSpawnMob            (const cMonster & a_Mob) override;
+	virtual void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override;
+	virtual void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) override;
+	virtual void SendStatistics          (const cStatManager & a_Manager) override;
+	virtual void SendTabCompletionResults(const AStringVector & a_Results) override;
+	virtual void SendTeleportEntity      (const cEntity & a_Entity) override;
+	virtual void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendTimeUpdate          (Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) override;
+	virtual void SendUnloadChunk         (int a_ChunkX, int a_ChunkZ) override;
+	virtual void SendUpdateBlockEntity   (cBlockEntity & a_BlockEntity) override;
+	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
+	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+	virtual void SendWeather             (eWeather a_Weather) override;
+	virtual void SendWholeInventory      (const cWindow & a_Window) override;
+	virtual void SendWindowClose         (const cWindow & a_Window) override;
+	virtual void SendWindowOpen          (const cWindow & a_Window) override;
+	virtual void SendWindowProperty      (const cWindow & a_Window, int a_Property, int a_Value) override;
 	
-	virtual AString GetAuthServerID(void) /*override*/;
+	virtual AString GetAuthServerID(void) override;
 
-	virtual void SendData(const char * a_Data, size_t a_Size) /*override*/;
+	virtual void SendData(const char * a_Data, size_t a_Size) override;
 
 protected:
 	cProtocol * m_Protocol;  ///< The recognized protocol
diff --git a/src/RCONServer.cpp b/src/RCONServer.cpp
index c33c33d21..141c67d1b 100644
--- a/src/RCONServer.cpp
+++ b/src/RCONServer.cpp
@@ -51,13 +51,13 @@ public:
 	{
 	}
 	
-	// cCommandOutputCallback /*override*/s:
-	virtual void Out(const AString & a_Text) /*override*/
+	// cCommandOutputCallback overrides:
+	virtual void Out(const AString & a_Text) override
 	{
 		m_Buffer.append(a_Text);
 	}
 	
-	virtual void Finished(void) /*override*/
+	virtual void Finished(void) override
 	{
 		m_Connection.SendResponse(m_RequestID, RCON_PACKET_RESPONSE, (int)m_Buffer.size(), m_Buffer.c_str());
 		delete this;
diff --git a/src/RCONServer.h b/src/RCONServer.h
index 93604cf28..47c746736 100644
--- a/src/RCONServer.h
+++ b/src/RCONServer.h
@@ -64,10 +64,10 @@ protected:
 		AString m_IPAddress;
 		
 
-		// cSocketThreads::cCallback /*override*/s:
-		virtual bool DataReceived(const char * a_Data, size_t a_Size) /*override*/;
-		virtual void GetOutgoingData(AString & a_Data) /*override*/;
-		virtual void SocketClosed(void) /*override*/;
+		// cSocketThreads::cCallback overrides:
+		virtual bool DataReceived(const char * a_Data, size_t a_Size) override;
+		virtual void GetOutgoingData(AString & a_Data) override;
+		virtual void SocketClosed(void) override;
 		
 		/// Processes the given packet and sends the response; returns true if successful, false if the connection is to be dropped
 		bool ProcessPacket(int a_RequestID, int a_PacketType, int a_PayloadLength, const char * a_Payload);
@@ -99,8 +99,8 @@ protected:
 	AString m_Password;
 
 
-	// cListenThread::cCallback /*override*/s:
-	virtual void OnConnectionAccepted(cSocket & a_Socket) /*override*/;
+	// cListenThread::cCallback overrides:
+	virtual void OnConnectionAccepted(cSocket & a_Socket) override;
 } ;
 
 
diff --git a/src/Server.cpp b/src/Server.cpp
index f3a1404aa..069e2a169 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -584,7 +584,7 @@ void cServer::PrintHelp(const AStringVector & a_Split, cCommandOutputCallback &
 	public:
 		cCallback(void) : m_MaxLen(0) {}
 		
-		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) /*override*/
+		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) override
 		{
 		UNUSED(a_Plugin);
 		UNUSED(a_Permission);
diff --git a/src/Server.h b/src/Server.h
index 8e190fdca..f20e6932f 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -171,8 +171,8 @@ private:
 	protected:
 		cServer & m_Server;
 		
-		// cIsThread /*override*/s:
-		virtual void Execute(void) /*override*/;
+		// cIsThread overrides:
+		virtual void Execute(void) override;
 	} ;
 	
 	
@@ -242,8 +242,8 @@ private:
 	/** Ticks the clients in m_Clients, manages the list in respect to removing clients */
 	void TickClients(float a_Dt);
 
-	// cListenThread::cCallback /*override*/s:
-	virtual void OnConnectionAccepted(cSocket & a_Socket) /*override*/;
+	// cListenThread::cCallback overrides:
+	virtual void OnConnectionAccepted(cSocket & a_Socket) override;
 };  // tolua_export
 
 
diff --git a/src/Simulator/DelayedFluidSimulator.h b/src/Simulator/DelayedFluidSimulator.h
index cf74274cb..8a6c26c7a 100644
--- a/src/Simulator/DelayedFluidSimulator.h
+++ b/src/Simulator/DelayedFluidSimulator.h
@@ -53,11 +53,11 @@ class cDelayedFluidSimulator :
 public:
 	cDelayedFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, int a_TickDelay);
 	
-	// cSimulator /*override*/s:
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/;
-	virtual void Simulate(float a_Dt) /*override*/;
-	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) /*override*/;
-	virtual cFluidSimulatorData * CreateChunkData(void) /*override*/ { return new cDelayedFluidSimulatorChunkData(m_TickDelay); }
+	// cSimulator overrides:
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override;
+	virtual void Simulate(float a_Dt) override;
+	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
+	virtual cFluidSimulatorData * CreateChunkData(void) override { return new cDelayedFluidSimulatorChunkData(m_TickDelay); }
 	
 protected:
 
@@ -73,7 +73,7 @@ protected:
 	|       adding blocks here ^ | ^ simulating here
 	*/
 	
-	/// Called from SimulateChunk() to simulate each block in one slot of blocks. Descendants /*override*/ this method to provide custom simulation.
+	/// Called from SimulateChunk() to simulate each block in one slot of blocks. Descendants override this method to provide custom simulation.
 	virtual void SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ) = 0;
 } ;
 
diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h
index 1174adf5c..9ccc3ef4f 100644
--- a/src/Simulator/FireSimulator.h
+++ b/src/Simulator/FireSimulator.h
@@ -22,10 +22,10 @@ public:
 	cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);
 	~cFireSimulator();
 
-	virtual void Simulate(float a_Dt) /*override*/ { UNUSED(a_Dt);}  // not used
-	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) /*override*/;
+	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}  // not used
+	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
 
-	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) /*override*/;
+	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;
 
 	static bool IsFuel   (BLOCKTYPE a_BlockType);
 	static bool DoesBurnForever(BLOCKTYPE a_BlockType);
@@ -44,7 +44,7 @@ protected:
 	int m_ReplaceFuelChance;
 	
 	
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/;
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override;
 	
 	/// Returns the time [msec] after which the specified fire block is stepped again; based on surrounding fuels
 	int GetBurnStepTime(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ);
diff --git a/src/Simulator/FloodyFluidSimulator.h b/src/Simulator/FloodyFluidSimulator.h
index c12dbd868..8e1be5e6b 100644
--- a/src/Simulator/FloodyFluidSimulator.h
+++ b/src/Simulator/FloodyFluidSimulator.h
@@ -35,8 +35,8 @@ protected:
 	NIBBLETYPE m_Falloff;
 	int        m_NumNeighborsForSource;
 	
-	// cDelayedFluidSimulator /*override*/s:
-	virtual void SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ) /*override*/;
+	// cDelayedFluidSimulator overrides:
+	virtual void SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override;
 	
 	/** Checks tributaries, if not fed, decreases the block's level and returns true. */
 	bool CheckTributaries(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_MyMeta);
diff --git a/src/Simulator/FluidSimulator.h b/src/Simulator/FluidSimulator.h
index dcfa05782..672b740a2 100644
--- a/src/Simulator/FluidSimulator.h
+++ b/src/Simulator/FluidSimulator.h
@@ -43,8 +43,8 @@ class cFluidSimulator :
 public:
 	cFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid);
 
-	// cSimulator /*override*/s:
-	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) /*override*/;
+	// cSimulator overrides:
+	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;
 	
 	/// Gets the flowing direction. If a_Over is true also the block over the current block affects the direction (standard)
 	virtual Direction GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a_Over = true);
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp
index c0a5f864f..7b3a2c2fa 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator.cpp
@@ -846,7 +846,7 @@ void cIncrementalRedstoneSimulator::HandleDropSpenser(int a_RelBlockX, int a_Rel
 	public:
 		cSetPowerToDropSpenser(bool a_IsPowered) : m_IsPowered(a_IsPowered) {}
 
-		virtual bool Item(cRedstonePoweredEntity * a_DropSpenser) /*override*/
+		virtual bool Item(cRedstonePoweredEntity * a_DropSpenser) override
 		{
 			a_DropSpenser->SetRedstonePower(m_IsPowered);
 			return false;
@@ -947,7 +947,7 @@ void cIncrementalRedstoneSimulator::HandleCommandBlock(int a_RelBlockX, int a_Re
 	public:
 		cSetPowerToCommandBlock(bool a_IsPowered) : m_IsPowered(a_IsPowered) {}
 
-		virtual bool Item(cCommandBlockEntity * a_CommandBlock) /*override*/
+		virtual bool Item(cCommandBlockEntity * a_CommandBlock) override
 		{
 			a_CommandBlock->SetRedstonePower(m_IsPowered);
 			return false;
@@ -1037,7 +1037,7 @@ void cIncrementalRedstoneSimulator::HandleNoteBlock(int a_RelBlockX, int a_RelBl
 			public:
 				cSetPowerToNoteBlock() {}
 
-				virtual bool Item(cRedstonePoweredEntity * a_NoteBlock) /*override*/
+				virtual bool Item(cRedstonePoweredEntity * a_NoteBlock) override
 				{
 					a_NoteBlock->SetRedstonePower(true);
 					return false;
@@ -1129,7 +1129,7 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_RelBlockX, int a_R
 				{
 				}
 
-				virtual bool Item(cEntity * a_Entity) /*override*/
+				virtual bool Item(cEntity * a_Entity) override
 				{
 					Vector3f EntityPos = a_Entity->GetPosition();
 					Vector3f BlockPos(m_X + 0.5f, (float)m_Y, m_Z + 0.5f);
@@ -1197,7 +1197,7 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_RelBlockX, int a_R
 				{
 				}
 
-				virtual bool Item(cEntity * a_Entity) /*override*/
+				virtual bool Item(cEntity * a_Entity) override
 				{
 					Vector3f EntityPos = a_Entity->GetPosition();
 					Vector3f BlockPos(m_X + 0.5f, (float)m_Y, m_Z + 0.5f);
@@ -1265,7 +1265,7 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_RelBlockX, int a_R
 				{
 				}
 
-				virtual bool Item(cEntity * a_Entity) /*override*/
+				virtual bool Item(cEntity * a_Entity) override
 				{
 					Vector3f EntityPos = a_Entity->GetPosition();
 					Vector3f BlockPos(m_X + 0.5f, (float)m_Y, m_Z + 0.5f);
@@ -1405,7 +1405,7 @@ void cIncrementalRedstoneSimulator::HandleTrappedChest(int a_RelBlockX, int a_Re
 		{
 		}
 
-		virtual bool Item(cChestEntity * a_Chest) /*override*/
+		virtual bool Item(cChestEntity * a_Chest) override
 		{
 			ASSERT(a_Chest->GetBlockType() == E_BLOCK_TRAPPED_CHEST);
 			m_NumberOfPlayers = a_Chest->GetNumberOfPlayers();
@@ -1455,7 +1455,7 @@ void cIncrementalRedstoneSimulator::HandleTripwire(int a_RelBlockX, int a_RelBlo
 		{
 		}
 
-		virtual bool Item(cEntity * a_Entity) /*override*/
+		virtual bool Item(cEntity * a_Entity) override
 		{
 			cBoundingBox bbWire(m_X, m_X + 1, m_Y, m_Y + 0.1, m_Z, m_Z + 1);
 			cBoundingBox bbEntity(a_Entity->GetPosition(), a_Entity->GetWidth() / 2, a_Entity->GetHeight());
diff --git a/src/Simulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator.h
index 3a3945d23..79740a8f6 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.h
+++ b/src/Simulator/IncrementalRedstoneSimulator.h
@@ -19,10 +19,10 @@ public:
 	cIncrementalRedstoneSimulator(cWorld & a_World);
 	~cIncrementalRedstoneSimulator();
 
-	virtual void Simulate(float a_Dt) /*override*/ { UNUSED(a_Dt);}  // not used
-	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) /*override*/;
-	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) /*override*/ { return IsRedstone(a_BlockType); }
-	virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/;
+	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}  // not used
+	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
+	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override { return IsRedstone(a_BlockType); }
+	virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override;
 
 	enum eRedstoneDirection
 	{
@@ -82,7 +82,7 @@ private:
 	SimulatedPlayerToggleableList * m_SimulatedPlayerToggleableBlocks;
 	RepeatersDelayList * m_RepeatersDelayList;
 
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/ { RedstoneAddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk); }
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override { RedstoneAddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk); }
 	void RedstoneAddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk, cChunk * a_OtherChunk = NULL);
 	cChunk * m_Chunk;
 
diff --git a/src/Simulator/NoopFluidSimulator.h b/src/Simulator/NoopFluidSimulator.h
index 1a616f416..9fe2f9040 100644
--- a/src/Simulator/NoopFluidSimulator.h
+++ b/src/Simulator/NoopFluidSimulator.h
@@ -26,15 +26,15 @@ public:
 	{
 	}
 
-	// cSimulator /*override*/s:
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/
+	// cSimulator overrides:
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override
 	{
 		UNUSED(a_BlockX);
 		UNUSED(a_BlockY);
 		UNUSED(a_BlockZ);
 		UNUSED(a_Chunk);
 	}
-	virtual void Simulate(float a_Dt) /*override*/ { UNUSED(a_Dt);}
+	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}
 } ;
 
 
diff --git a/src/Simulator/NoopRedstoneSimulator.h b/src/Simulator/NoopRedstoneSimulator.h
index 43b694db8..f9ed47982 100644
--- a/src/Simulator/NoopRedstoneSimulator.h
+++ b/src/Simulator/NoopRedstoneSimulator.h
@@ -20,16 +20,16 @@ public:
 
 	// ~cRedstoneNoopSimulator();
 
-	virtual void Simulate(float a_Dt) /*override*/ { UNUSED(a_Dt);}  // not used
-	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) /*override*/
+	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}  // not used
+	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override
 	{
 		UNUSED(a_Dt);
 		UNUSED(a_ChunkX);
 		UNUSED(a_ChunkZ);
 		UNUSED(a_Chunk);
 	}
-	virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType) /*override*/ { return false; }
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/
+	virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType) override { return false; }
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override
 	{
 		UNUSED(a_BlockX);
 		UNUSED(a_BlockY);
diff --git a/src/Simulator/SandSimulator.h b/src/Simulator/SandSimulator.h
index c6a54ee02..1262f2792 100644
--- a/src/Simulator/SandSimulator.h
+++ b/src/Simulator/SandSimulator.h
@@ -14,10 +14,10 @@ class cSandSimulator :
 public:
 	cSandSimulator(cWorld & a_World, cIniFile & a_IniFile);
 
-	// cSimulator /*override*/s:
-	virtual void Simulate(float a_Dt) /*override*/ { UNUSED(a_Dt);}  // not used
-	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) /*override*/;
-	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) /*override*/;
+	// cSimulator overrides:
+	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}  // not used
+	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
+	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;
 	
 	/// Returns true if a falling-able block can start falling through the specified block type
 	static bool CanStartFallingThrough(BLOCKTYPE a_BlockType);
@@ -46,7 +46,7 @@ protected:
 	
 	int  m_TotalBlocks;    // Total number of blocks currently in the queue for simulating
 	
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/;
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override;
 	
 	/// Performs the instant fall of the block - removes it from top, Finishes it at the bottom
 	void DoInstantFall(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ);
diff --git a/src/Simulator/VanillaFluidSimulator.h b/src/Simulator/VanillaFluidSimulator.h
index 964b5b466..89a56ca14 100644
--- a/src/Simulator/VanillaFluidSimulator.h
+++ b/src/Simulator/VanillaFluidSimulator.h
@@ -29,8 +29,8 @@ public:
 	cVanillaFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, NIBBLETYPE a_Falloff, int a_TickDelay, int a_NumNeighborsForSource);
 	
 protected:
-	// cFloodyFluidSimulator /*override*/s:
-	virtual void SpreadXZ(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_NewMeta) /*override*/;
+	// cFloodyFluidSimulator overrides:
+	virtual void SpreadXZ(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_NewMeta) override;
 
 	/** Recursively calculates the minimum number of blocks needed to descend a level. */
 	int CalculateFlowCost(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, Direction a_Dir, unsigned a_Iteration = 0);
diff --git a/src/Simulator/VaporizeFluidSimulator.h b/src/Simulator/VaporizeFluidSimulator.h
index e1c345672..c8eb7802b 100644
--- a/src/Simulator/VaporizeFluidSimulator.h
+++ b/src/Simulator/VaporizeFluidSimulator.h
@@ -24,9 +24,9 @@ class cVaporizeFluidSimulator :
 public:
 	cVaporizeFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid);
 
-	// cSimulator /*override*/s:
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) /*override*/;
-	virtual void Simulate(float a_Dt) /*override*/;
+	// cSimulator overrides:
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override;
+	virtual void Simulate(float a_Dt) override;
 } ;
 
 
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index cf0a129df..6bbc87b76 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -99,10 +99,10 @@ public:
 	cSlotAreaInventoryBase(int a_NumSlots, int a_SlotOffset, cWindow & a_ParentWindow);
 	
 	// Creative inventory's click handling is somewhat different from survival inventory's, handle that here:
-	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
+	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
 
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 	
 protected:
 	int m_SlotOffset;  // Index that this area's slot 0 has in the underlying cInventory
@@ -157,10 +157,10 @@ public:
 	}
 
 	/** Distributing the stack is allowed only for compatible items (helmets into helmet slot etc.) */
-	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) /*override*/;
+	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;
 
 	/** Called when a player clicks in the window. Parameters taken from the click packet. */
-	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
+	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
 
 	static bool CanPlaceArmorInSlot(int a_SlotNum, const cItem & a_Item);
 } ;
@@ -181,14 +181,14 @@ public:
 	
 	virtual ~cSlotAreaItemGrid();
 	
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 
 protected:
 	cItemGrid & m_ItemGrid;
 	
-	// cItemGrid::cListener /*override*/s:
-	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+	// cItemGrid::cListener overrides:
+	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
 } ;
 
 
@@ -207,11 +207,11 @@ class cSlotAreaTemporary :
 public:
 	cSlotAreaTemporary(int a_NumSlots, cWindow & a_ParentWindow);
 	
-	// cSlotArea /*override*/s:
-	virtual const cItem * GetSlot        (int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot        (int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
-	virtual void          OnPlayerAdded  (cPlayer & a_Player) /*override*/;
-	virtual void          OnPlayerRemoved(cPlayer & a_Player) /*override*/;
+	// cSlotArea overrides:
+	virtual const cItem * GetSlot        (int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot        (int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
+	virtual void          OnPlayerAdded  (cPlayer & a_Player) override;
+	virtual void          OnPlayerRemoved(cPlayer & a_Player) override;
 	
 	/// Tosses the player's items in slots [a_Begin, a_End) (ie. incl. a_Begin, but excl. a_End)
 	void TossItems(cPlayer & a_Player, int a_Begin, int a_End);
@@ -238,14 +238,14 @@ public:
 	/// a_GridSize is allowed to be only 2 or 3
 	cSlotAreaCrafting(int a_GridSize, cWindow & a_ParentWindow);
 
-	// cSlotAreaTemporary /*override*/s:
-	virtual void Clicked        (cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
+	// cSlotAreaTemporary overrides:
+	virtual void Clicked        (cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
 	virtual void DblClicked     (cPlayer & a_Player, int a_SlotNum);
-	virtual void OnPlayerRemoved(cPlayer & a_Player) /*override*/;
-	virtual void SetSlot        (int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual void OnPlayerRemoved(cPlayer & a_Player) override;
+	virtual void SetSlot        (int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 	
 	// Distributing items into this area is completely disabled
-	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) /*override*/;
+	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;
 
 
 protected:
@@ -286,13 +286,13 @@ class cSlotAreaAnvil :
 public:
 	cSlotAreaAnvil(cAnvilWindow & a_ParentWindow);
 
-	// cSlotArea /*override*/s:
-	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
-	virtual void ShiftClicked(cPlayer & a_Player, int a_SlotNum, const cItem & a_ClickedItem) /*override*/;
-	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) /*override*/;
+	// cSlotArea overrides:
+	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
+	virtual void ShiftClicked(cPlayer & a_Player, int a_SlotNum, const cItem & a_ClickedItem) override;
+	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;
 
-	// cSlotAreaTemporary /*override*/s:
-	virtual void OnPlayerRemoved(cPlayer & a_Player) /*override*/;
+	// cSlotAreaTemporary overrides:
+	virtual void OnPlayerRemoved(cPlayer & a_Player) override;
 
 	/** Can the player take the item from the slot? */
 	bool CanTakeResultItem(cPlayer & a_Player);
@@ -327,16 +327,16 @@ public:
 
 	bool IsPlaceableItem(short a_ItemType);
 	
-	virtual void          Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
-	virtual void          DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) /*override*/;
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual void          Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
+	virtual void          DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 
 protected:
 	cBeaconEntity * m_Beacon;
 
-	// cItemGrid::cListener /*override*/s:
-	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+	// cItemGrid::cListener overrides:
+	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
 } ;
 
 
@@ -351,14 +351,14 @@ class cSlotAreaEnchanting :
 public:
 	cSlotAreaEnchanting(cEnchantingWindow & a_ParentWindow, int a_BlockX, int a_BlockY, int a_BlockZ);
 
-	// cSlotArea /*override*/s:
-	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
-	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) /*override*/;
+	// cSlotArea overrides:
+	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
+	virtual void DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;
 	virtual void SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 
-	// cSlotAreaTemporary /*override*/s:
+	// cSlotAreaTemporary overrides:
 	virtual void OnPlayerAdded  (cPlayer & a_Player) override;
-	virtual void OnPlayerRemoved(cPlayer & a_Player) /*override*/;
+	virtual void OnPlayerRemoved(cPlayer & a_Player) override;
 
 	/* Get the count of bookshelves who stand in the near of the enchanting table */
 	int GetBookshelvesCount(cWorld * a_World);
@@ -380,8 +380,8 @@ class cSlotAreaChest :
 public:
 	cSlotAreaChest(cChestEntity * a_Chest, cWindow & a_ParentWindow);
 	
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 	
 protected:
 	cChestEntity * m_Chest;
@@ -397,8 +397,8 @@ class cSlotAreaDoubleChest :
 public:
 	cSlotAreaDoubleChest(cChestEntity * a_TopChest, cChestEntity * a_BottomChest, cWindow & a_ParentWindow);
 	
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 	
 protected:
 	cChestEntity * m_TopChest;
@@ -415,8 +415,8 @@ class cSlotAreaEnderChest :
 public:
 	cSlotAreaEnderChest(cEnderChestEntity * a_EnderChest, cWindow & a_ParentWindow);
 
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 
 protected:
 	cEnderChestEntity * m_EnderChest;
@@ -437,16 +437,16 @@ public:
 	
 	virtual ~cSlotAreaFurnace();
 	
-	virtual void          Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) /*override*/;
-	virtual void          DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) /*override*/;
-	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const /*override*/;
-	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) /*override*/;
+	virtual void          Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
+	virtual void          DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) override;
+	virtual const cItem * GetSlot(int a_SlotNum, cPlayer & a_Player) const override;
+	virtual void          SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 	
 protected:
 	cFurnaceEntity * m_Furnace;
 
-	// cItemGrid::cListener /*override*/s:
-	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+	// cItemGrid::cListener overrides:
+	virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
 
 	/// Called after an item has been smelted to handle statistics e.t.c.
 	void HandleSmeltItem(const cItem & a_Result, cPlayer & a_Player);
diff --git a/src/UI/Window.h b/src/UI/Window.h
index 4546fb9ad..3d860407f 100644
--- a/src/UI/Window.h
+++ b/src/UI/Window.h
@@ -269,7 +269,7 @@ public:
 	cBeaconEntity * GetBeaconEntity(void) const { return m_Beacon; }
 
 	// cWindow Overrides:
-	virtual void OpenedByPlayer(cPlayer & a_Player) /*override*/;
+	virtual void OpenedByPlayer(cPlayer & a_Player) override;
 
 protected:
 	cBeaconEntity * m_Beacon;
@@ -285,8 +285,8 @@ class cEnchantingWindow :
 	typedef cWindow super;
 public:
 	cEnchantingWindow(int a_BlockX, int a_BlockY, int a_BlockZ);
-	virtual void SetProperty(int a_Property, int a_Value, cPlayer & a_Player) /*override*/;
-	virtual void SetProperty(int a_Property, int a_Value) /*override*/;
+	virtual void SetProperty(int a_Property, int a_Value, cPlayer & a_Player) override;
+	virtual void SetProperty(int a_Property, int a_Value) override;
 
 	/** Return the Value of a Property */
 	int GetPropertyValue(int a_Property);
@@ -346,8 +346,8 @@ public:
 	cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest);
 	~cChestWindow();
 
-	virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) /*override*/;
-	virtual void OpenedByPlayer(cPlayer & a_Player) /*override*/;
+	virtual bool ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) override;
+	virtual void OpenedByPlayer(cPlayer & a_Player) override;
 	
 protected:
 	cWorld * m_World;
diff --git a/src/UI/WindowOwner.h b/src/UI/WindowOwner.h
index 5b41e9908..7a7941e37 100644
--- a/src/UI/WindowOwner.h
+++ b/src/UI/WindowOwner.h
@@ -81,7 +81,7 @@ public:
 		m_BlockEntity = a_BlockEntity;
 	}
 	
-	virtual void GetBlockPos(int & a_BlockX, int & a_BlockY, int & a_BlockZ) /*override*/
+	virtual void GetBlockPos(int & a_BlockX, int & a_BlockY, int & a_BlockZ) override
 	{
 		a_BlockX = m_BlockEntity->GetPosX();
 		a_BlockY = m_BlockEntity->GetPosY();
@@ -113,7 +113,7 @@ public:
 		m_Entity = a_Entity;
 	}
 
-	virtual void GetBlockPos(int & a_BlockX, int & a_BlockY, int & a_BlockZ) /*override*/
+	virtual void GetBlockPos(int & a_BlockX, int & a_BlockY, int & a_BlockZ) override
 	{
 		a_BlockX = (int)floor(m_Entity->GetPosX() + 0.5);
 		a_BlockY = (int)floor(m_Entity->GetPosY() + 0.5);
diff --git a/src/VoronoiMap.cpp b/src/VoronoiMap.cpp
index 3938e77ea..5efd09c01 100644
--- a/src/VoronoiMap.cpp
+++ b/src/VoronoiMap.cpp
@@ -66,7 +66,7 @@ int cVoronoiMap::GetValueAt(int a_X, int a_Y, int & a_MinDist1, int & a_MinDist2
 	// Get 5x5 neighboring cell seeds, compare distance to each. Return the value in the minumim-distance cell
 	int MinDist = m_CellSize * m_CellSize * 16;  // There has to be a cell closer than this
 	int MinDist2 = MinDist;
-	int res = 0;  // Will be /*override*/n
+	int res = 0;  // Will be overriden
 	for (int x = 0; x < 5; x++)
 	{
 		for (int z = 0; z < 5; z++)
diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp
index 00ac040b5..23eedbd14 100644
--- a/src/WebAdmin.cpp
+++ b/src/WebAdmin.cpp
@@ -23,7 +23,7 @@
 class cPlayerAccum :
 	public cPlayerListCallback
 {
-	virtual bool Item(cPlayer * a_Player) /*override*/
+	virtual bool Item(cPlayer * a_Player) override
 	{
 		m_Contents.append("<li>");
 		m_Contents.append(a_Player->GetName());
diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index 33b924c4b..aefc1d145 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -171,20 +171,20 @@ protected:
 		{
 		}
 
-		// cRequestData /*override*/s:
-		virtual void OnBody(const char * a_Data, size_t a_Size) /*override*/;
+		// cRequestData overrides:
+		virtual void OnBody(const char * a_Data, size_t a_Size) override;
 
-		// cHTTPFormParser::cCallbacks /*override*/s. Files are ignored:
-		virtual void OnFileStart(cHTTPFormParser &, const AString & a_FileName) /*override*/
+		// cHTTPFormParser::cCallbacks overrides. Files are ignored:
+		virtual void OnFileStart(cHTTPFormParser &, const AString & a_FileName) override
 		{
 			UNUSED(a_FileName);
 		}
-		virtual void OnFileData(cHTTPFormParser &, const char * a_Data, size_t a_Size) /*override*/
+		virtual void OnFileData(cHTTPFormParser &, const char * a_Data, size_t a_Size) override
 		{
 			UNUSED(a_Data);
 			UNUSED(a_Size);
 		}
-		virtual void OnFileEnd(cHTTPFormParser &) /*override*/ {}
+		virtual void OnFileEnd(cHTTPFormParser &) override {}
 	} ;
 
 
@@ -214,10 +214,10 @@ protected:
 	/** Handles requests for the root page */
 	void HandleRootRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request);
 
-	// cHTTPServer::cCallbacks /*override*/s:
-	virtual void OnRequestBegun   (cHTTPConnection & a_Connection, cHTTPRequest & a_Request) /*override*/;
-	virtual void OnRequestBody    (cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) /*override*/;
-	virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) /*override*/;
+	// cHTTPServer::cCallbacks overrides:
+	virtual void OnRequestBegun   (cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override;
+	virtual void OnRequestBody    (cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) override;
+	virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override;
 } ;  // tolua_export
 
 
diff --git a/src/World.cpp b/src/World.cpp
index 50bc6224d..2a3336dee 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -98,7 +98,7 @@ protected:
 
 	cWorld * m_World;
 	
-	virtual void Execute(void) /*override*/
+	virtual void Execute(void) override
 	{
 		for (;;)
 		{
@@ -150,7 +150,7 @@ protected:
 
 	cLightingThread * m_Lighting;
 	
-	virtual void Execute(void) /*override*/
+	virtual void Execute(void) override
 	{
 		for (;;)
 		{
@@ -489,7 +489,7 @@ void cWorld::InitializeSpawn(void)
 	class cTracerCallbacks :
 		public cBlockTracer::cCallbacks
 	{
-		virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) /*override*/
+		virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override
 		{
 			LOGD("Block {%d, %d, %d}: %d:%d (%s)",
 				a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta,
@@ -498,7 +498,7 @@ void cWorld::InitializeSpawn(void)
 			return false;
 		}
 		
-		virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/
+		virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ) override
 		{
 			LOGD("Block {%d, %d, %d}: no data available",
 				a_BlockX, a_BlockY, a_BlockZ
@@ -506,19 +506,19 @@ void cWorld::InitializeSpawn(void)
 			return false;
 		}
 
-		virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) /*override*/
+		virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) override
 		{
 			LOGD("Out of world at {%f, %f, %f}", a_BlockX, a_BlockY, a_BlockZ);
 			return false;
 		}
 
-		virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) /*override*/
+		virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) override
 		{
 			LOGD("Into world at {%f, %f, %f}", a_BlockX, a_BlockY, a_BlockZ);
 			return false;
 		}
 
-		virtual void OnNoMoreHits(void) /*override*/
+		virtual void OnNoMoreHits(void) override
 		{
 			LOGD("No more hits");
 		}
@@ -559,7 +559,7 @@ void cWorld::Start(void)
 		IniFile.AddKeyComment(" LinkedWorlds", "This section governs portal world linkage; leave a value blank to disabled that associated method of teleportation");
 	}
 
-	// The presence of a configuration value /*override*/s everything
+	// The presence of a configuration value overrides everything
 	// If no configuration value is found, GetDimension() is written to file and the variable is written to again to ensure that cosmic rays haven't sneakily changed its value
 	m_Dimension = StringToDimension(IniFile.GetValueSet("General", "Dimension", DimensionToString(GetDimension())));
 
@@ -2853,7 +2853,7 @@ bool cWorld::SetCommandBlockCommand(int a_BlockX, int a_BlockY, int a_BlockZ, co
 	public:
 		cUpdateCommandBlock(const AString & a_Command) : m_Command(a_Command) {}
 			
-		virtual bool Item(cCommandBlockEntity * a_CommandBlock) /*override*/
+		virtual bool Item(cCommandBlockEntity * a_CommandBlock) override
 		{
 			a_CommandBlock->SetCommand(m_Command);
 			return false;
diff --git a/src/World.h b/src/World.h
index b9191caef..49932ac9d 100644
--- a/src/World.h
+++ b/src/World.h
@@ -109,8 +109,8 @@ public:
 		public cTask
 	{
 	protected:
-		// cTask /*override*/s:
-		virtual void Run(cWorld & a_World) /*override*/;
+		// cTask overrides:
+		virtual void Run(cWorld & a_World) override;
 	} ;
 	
 
@@ -118,8 +118,8 @@ public:
 		public cTask
 	{
 	protected:
-		// cTask /*override*/s:
-		virtual void Run(cWorld & a_World) /*override*/;
+		// cTask overrides:
+		virtual void Run(cWorld & a_World) override;
 	};
 
 
@@ -130,8 +130,8 @@ public:
 		cTaskSendBlockToAllPlayers(std::vector<Vector3i> & a_SendQueue);
 
 	protected:
-		// cTask /*override*/s:
-		virtual void Run(cWorld & a_World) /*override*/;
+		// cTask overrides:
+		virtual void Run(cWorld & a_World) override;
 
 		std::vector<Vector3i> m_SendQueue;
 	};
@@ -156,15 +156,15 @@ public:
 		BroadcastTimeUpdate();
 	}
 
-	virtual Int64 GetWorldAge (void) const /*override*/ { return m_WorldAge; }
-	virtual Int64 GetTimeOfDay(void) const /*override*/ { return m_TimeOfDay; }
+	virtual Int64 GetWorldAge (void) const override { return m_WorldAge; }
+	virtual Int64 GetTimeOfDay(void) const override { return m_TimeOfDay; }
 	
 	void SetTicksUntilWeatherChange(int a_WeatherInterval)
 	{
 		m_WeatherInterval = a_WeatherInterval;
 	}
 
-	virtual void SetTimeOfDay(Int64 a_TimeOfDay) /*override*/
+	virtual void SetTimeOfDay(Int64 a_TimeOfDay) override
 	{
 		m_TimeOfDay = a_TimeOfDay;
 		m_TimeOfDaySecs = (double)a_TimeOfDay / 20.0;
@@ -235,7 +235,7 @@ public:
 	void BroadcastEntityRelMoveLook      (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
 	void BroadcastEntityStatus           (const cEntity & a_Entity, char a_Status, const cClientHandle * a_Exclude = NULL);
 	void BroadcastEntityVelocity         (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	virtual void BroadcastEntityAnimation(const cEntity & a_Entity, char a_Animation, const cClientHandle * a_Exclude = NULL) /*override*/;  // tolua_export
+	virtual void BroadcastEntityAnimation(const cEntity & a_Entity, char a_Animation, const cClientHandle * a_Exclude = NULL) override;  // tolua_export
 	void BroadcastParticleEffect         (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount, cClientHandle * a_Exclude = NULL);  // tolua_export
 	void BroadcastPlayerListItem         (const cPlayer & a_Player, bool a_IsOnline, const cClientHandle * a_Exclude = NULL);
 	void BroadcastRemoveEntityEffect     (const cEntity & a_Entity, int a_EffectID, const cClientHandle * a_Exclude = NULL);
@@ -248,10 +248,10 @@ public:
 	void BroadcastTeleportEntity         (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
 	void BroadcastThunderbolt            (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
 	void BroadcastTimeUpdate             (const cClientHandle * a_Exclude = NULL);
-	virtual void BroadcastUseBed         (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
+	virtual void BroadcastUseBed         (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ) override;
 	void BroadcastWeather                (eWeather a_Weather, const cClientHandle * a_Exclude = NULL);
 	
-	virtual cBroadcastInterface & GetBroadcastManager(void) /*override*/
+	virtual cBroadcastInterface & GetBroadcastManager(void) override
 	{
 		return *this;
 	}
@@ -299,7 +299,7 @@ public:
 	void RemovePlayer(cPlayer * a_Player, bool a_RemoveFromChunk);
 
 	/** Calls the callback for each player in the list; returns true if all players processed, false if the callback aborted by returning true */
-	virtual bool ForEachPlayer(cPlayerListCallback & a_Callback) /*override*/;  // >> EXPORTED IN MANUALBINDINGS <<
+	virtual bool ForEachPlayer(cPlayerListCallback & a_Callback) override;  // >> EXPORTED IN MANUALBINDINGS <<
 
 	/** Calls the callback for the player of the given name; returns true if the player was found and the callback called, false if player not found. Callback return ignored */
 	bool DoWithPlayer(const AString & a_PlayerName, cPlayerListCallback & a_Callback);  // >> EXPORTED IN MANUALBINDINGS <<
@@ -394,7 +394,7 @@ public:
 	bool IsChunkLighted(int a_ChunkX, int a_ChunkZ);
 	
 	/** Calls the callback for each chunk in the coords specified (all cords are inclusive). Returns true if all chunks have been processed successfully */
-	virtual bool ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a_MinChunkZ, int a_MaxChunkZ, cChunkDataCallback & a_Callback) /*override*/;
+	virtual bool ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a_MinChunkZ, int a_MaxChunkZ, cChunkDataCallback & a_Callback) override;
 
 	// tolua_begin
 	
@@ -453,15 +453,15 @@ public:
 	Prefer cBlockArea::Write() instead, this is the internal implementation; cBlockArea does error checking, too.
 	a_DataTypes is a bitmask of cBlockArea::baXXX constants ORed together.
 	*/
-	virtual bool WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) /*override*/;
+	virtual bool WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) override;
 	
 	// tolua_begin
 
 	/** Spawns item pickups for each item in the list. May compress pickups if too many entities: */
-	virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed = 1.0, bool IsPlayerCreated = false) /*override*/;
+	virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed = 1.0, bool IsPlayerCreated = false) override;
 	
 	/** Spawns item pickups for each item in the list. May compress pickups if too many entities. All pickups get the speed specified: */
-	virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ, bool IsPlayerCreated = false) /*override*/;
+	virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ, bool IsPlayerCreated = false) override;
 	
 	/** Spawns an falling block entity at the given position. It returns the UniqueID of the spawned falling block. */
 	int SpawnFallingBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE BlockType, NIBBLETYPE BlockMeta);
@@ -485,14 +485,14 @@ public:
 	
 	// tolua_begin
 	bool DigBlock   (int a_X, int a_Y, int a_Z);
-	virtual void SendBlockTo(int a_X, int a_Y, int a_Z, cPlayer * a_Player) /*override*/;
+	virtual void SendBlockTo(int a_X, int a_Y, int a_Z, cPlayer * a_Player) override;
 
 	double GetSpawnX(void) const { return m_SpawnX; }
 	double GetSpawnY(void) const { return m_SpawnY; }
 	double GetSpawnZ(void) const { return m_SpawnZ; }
 
 	/** Wakes up the simulators for the specified block */
-	virtual void WakeUpSimulators(int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/;
+	virtual void WakeUpSimulators(int a_BlockX, int a_BlockY, int a_BlockZ) override;
 	
 	/** Wakes up the simulators for the specified area of blocks */
 	void WakeUpSimulatorsInArea(int a_MinBlockX, int a_MaxBlockX, int a_MinBlockY, int a_MaxBlockY, int a_MinBlockZ, int a_MaxBlockZ);
@@ -536,10 +536,10 @@ public:
 	| esWitherBirth      | cMonster *       |
 	| esPlugin           | void *           |
 	*/
-	virtual void DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_BlockY, double a_BlockZ, bool a_CanCauseFire, eExplosionSource a_Source, void * a_SourceData) /*override*/;  // tolua_export
+	virtual void DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_BlockY, double a_BlockZ, bool a_CanCauseFire, eExplosionSource a_Source, void * a_SourceData) override;  // tolua_export
 
 	/** Calls the callback for the block entity at the specified coords; returns false if there's no block entity at those coords, true if found */
-	virtual bool DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBlockEntityCallback & a_Callback) /*override*/;  // Exported in ManualBindings.cpp
+	virtual bool DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBlockEntityCallback & a_Callback) override;  // Exported in ManualBindings.cpp
 
 	/** Calls the callback for the beacon at the specified coords; returns false if there's no beacon at those coords, true if found */
 	bool DoWithBeaconAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBeaconCallback & a_Callback);  // Exported in ManualBindings.cpp
@@ -768,7 +768,7 @@ public:
 	bool IsBlockDirectlyWatered(int a_BlockX, int a_BlockY, int a_BlockZ);  // tolua_export
 	
 	/** Spawns a mob of the specified type. Returns the mob's EntityID if recognized and spawned, <0 otherwise */
-	virtual int SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eType a_MonsterType) /*override*/;  // tolua_export
+	virtual int SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eType a_MonsterType) override;  // tolua_export
 	int SpawnMobFinalize(cMonster* a_Monster);
 	
 	/** Creates a projectile of the specified type. Returns the projectile's EntityID if successful, <0 otherwise
@@ -806,8 +806,8 @@ private:
 	protected:
 		cWorld & m_World;
 		
-		// cIsThread /*override*/s:
-		virtual void Execute(void) /*override*/;
+		// cIsThread overrides:
+		virtual void Execute(void) override;
 	} ;
 	
 	
@@ -818,14 +818,14 @@ private:
 	{
 		cWorld * m_World;
 		
-		// cChunkSink /*override*/s:
-		virtual void OnChunkGenerated  (cChunkDesc & a_ChunkDesc) /*override*/;
-		virtual bool IsChunkValid      (int a_ChunkX, int a_ChunkZ) /*override*/;
-		virtual bool HasChunkAnyClients(int a_ChunkX, int a_ChunkZ) /*override*/;
+		// cChunkSink overrides:
+		virtual void OnChunkGenerated  (cChunkDesc & a_ChunkDesc) override;
+		virtual bool IsChunkValid      (int a_ChunkX, int a_ChunkZ) override;
+		virtual bool HasChunkAnyClients(int a_ChunkX, int a_ChunkZ) override;
 		
-		// cPluginInterface /*override*/s:
-		virtual void CallHookChunkGenerating(cChunkDesc & a_ChunkDesc) /*override*/;
-		virtual void CallHookChunkGenerated (cChunkDesc & a_ChunkDesc) /*override*/;
+		// cPluginInterface overrides:
+		virtual void CallHookChunkGenerating(cChunkDesc & a_ChunkDesc) override;
+		virtual void CallHookChunkGenerated (cChunkDesc & a_ChunkDesc) override;
 		
 	public:
 		cChunkGeneratorCallbacks(cWorld & a_World);
diff --git a/src/WorldStorage/FastNBT.cpp b/src/WorldStorage/FastNBT.cpp
index dff611970..c6294b99c 100644
--- a/src/WorldStorage/FastNBT.cpp
+++ b/src/WorldStorage/FastNBT.cpp
@@ -11,7 +11,7 @@
 
 
 // The number of NBT tags that are reserved when an NBT parsing is started.
-// You can /*override*/ this by using a cmdline define
+// You can override this by using a cmdline define
 #ifndef NBT_RESERVE_SIZE
 	#define NBT_RESERVE_SIZE 200
 #endif  // NBT_RESERVE_SIZE
diff --git a/src/WorldStorage/NBTChunkSerializer.h b/src/WorldStorage/NBTChunkSerializer.h
index cd47bb72d..4c229a65c 100644
--- a/src/WorldStorage/NBTChunkSerializer.h
+++ b/src/WorldStorage/NBTChunkSerializer.h
@@ -123,11 +123,11 @@ protected:
 	
 	void AddMinecartChestContents(cMinecartWithChest * a_Minecart);
 	
-	// cChunkDataSeparateCollector /*override*/s:
-	virtual void LightIsValid(bool a_IsLightValid) /*override*/;
-	virtual void BiomeData(const cChunkDef::BiomeMap * a_BiomeMap) /*override*/;
-	virtual void Entity(cEntity * a_Entity) /*override*/;
-	virtual void BlockEntity(cBlockEntity * a_Entity) /*override*/;
+	// cChunkDataSeparateCollector overrides:
+	virtual void LightIsValid(bool a_IsLightValid) override;
+	virtual void BiomeData(const cChunkDef::BiomeMap * a_BiomeMap) override;
+	virtual void Entity(cEntity * a_Entity) override;
+	virtual void BlockEntity(cBlockEntity * a_Entity) override;
 } ;  // class cNBTChunkSerializer
 
 
diff --git a/src/WorldStorage/WSSAnvil.h b/src/WorldStorage/WSSAnvil.h
index a1f9b293b..591ec6757 100644
--- a/src/WorldStorage/WSSAnvil.h
+++ b/src/WorldStorage/WSSAnvil.h
@@ -236,10 +236,10 @@ protected:
 	/// Copies a_Length bytes of data from the specified NBT Tag's Child into the a_Destination buffer
 	void CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, size_t a_Length);
 		
-	// cWSSchema /*override*/s:
-	virtual bool LoadChunk(const cChunkCoords & a_Chunk) /*override*/;
-	virtual bool SaveChunk(const cChunkCoords & a_Chunk) /*override*/;
-	virtual const AString GetName(void) const /*override*/ {return "anvil"; }
+	// cWSSchema overrides:
+	virtual bool LoadChunk(const cChunkCoords & a_Chunk) override;
+	virtual bool SaveChunk(const cChunkCoords & a_Chunk) override;
+	virtual const AString GetName(void) const override {return "anvil"; }
 } ;
 
 
diff --git a/src/WorldStorage/WSSCompact.h b/src/WorldStorage/WSSCompact.h
index 88910fa96..83e9cb49f 100644
--- a/src/WorldStorage/WSSCompact.h
+++ b/src/WorldStorage/WSSCompact.h
@@ -40,10 +40,10 @@ protected:
 	Json::Value m_Root;
 	bool m_HasJsonData;
 	
-	// cChunkDataCollector /*override*/s:
-	virtual void Entity       (cEntity *      a_Entity) /*override*/;
-	virtual void BlockEntity  (cBlockEntity * a_Entity) /*override*/;
-	virtual void LightIsValid (bool a_IsLightValid) /*override*/;
+	// cChunkDataCollector overrides:
+	virtual void Entity       (cEntity *      a_Entity) override;
+	virtual void BlockEntity  (cBlockEntity * a_Entity) override;
+	virtual void LightIsValid (bool a_IsLightValid) override;
 } ;
 
 
@@ -140,10 +140,10 @@ protected:
 		
 	void LoadEntitiesFromJson(Json::Value & a_Value, cEntityList & a_Entities, cBlockEntityList & a_BlockEntities, cWorld * a_World);
 
-	// cWSSchema /*override*/s:
-	virtual bool LoadChunk(const cChunkCoords & a_Chunk) /*override*/;
-	virtual bool SaveChunk(const cChunkCoords & a_Chunk) /*override*/;
-	virtual const AString GetName(void) const /*override*/ {return "compact"; }
+	// cWSSchema overrides:
+	virtual bool LoadChunk(const cChunkCoords & a_Chunk) override;
+	virtual bool SaveChunk(const cChunkCoords & a_Chunk) override;
+	virtual const AString GetName(void) const override {return "compact"; }
 } ;
 
 
diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp
index c35bbbad0..667a28470 100644
--- a/src/WorldStorage/WorldStorage.cpp
+++ b/src/WorldStorage/WorldStorage.cpp
@@ -25,10 +25,10 @@ public:
 	cWSSForgetful(cWorld * a_World) : cWSSchema(a_World) {}
 	
 protected:
-	// cWSSchema /*override*/s:
-	virtual bool LoadChunk(const cChunkCoords & a_Chunk) /*override*/ {return false; }
-	virtual bool SaveChunk(const cChunkCoords & a_Chunk) /*override*/ {return true; }
-	virtual const AString GetName(void) const /*override*/ {return "forgetful"; }
+	// cWSSchema overrides:
+	virtual bool LoadChunk(const cChunkCoords & a_Chunk) override {return false; }
+	virtual bool SaveChunk(const cChunkCoords & a_Chunk) override {return true; }
+	virtual const AString GetName(void) const override {return "forgetful"; }
 } ;
 
 
diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h
index 21f5ca25d..5f89ead53 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -126,7 +126,7 @@ protected:
 	
 	void InitSchemas(int a_StorageCompressionFactor);
 	
-	virtual void Execute(void) /*override*/;
+	virtual void Execute(void) override;
 	
 	cEvent m_Event;       // Set when there's any addition to the queues
 
diff --git a/src/XMLParser.h b/src/XMLParser.h
index 6e4ce2243..e39405529 100644
--- a/src/XMLParser.h
+++ b/src/XMLParser.h
@@ -3,7 +3,7 @@
 
 // Interfaces to the CXMLParser class representing the base class for XML parsing
 
-// To use, derive a class from this base and /*override*/ its OnStartElement(), OnEndElement() and OnCharacters() functions
+// To use, derive a class from this base and override its OnStartElement(), OnEndElement() and OnCharacters() functions