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