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/Mobs/Old Mobs/Cow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Mobs/Old Mobs/Cow.h') 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); } } ; -- cgit v1.2.3