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/Blocks/BlockMycelium.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Blocks/BlockMycelium.h') 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"; } -- cgit v1.2.3