From 28f66efe307150558f4ad2546e058370a828be3e Mon Sep 17 00:00:00 2001 From: Tycho Date: Fri, 5 Sep 2014 15:56:31 +0100 Subject: Revert "Temporarily commented out override directives." This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h --- src/Entities/Pawn.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Entities/Pawn.h') 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 -- cgit v1.2.3