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/VoronoiMap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/VoronoiMap.cpp') 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++) -- cgit v1.2.3