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/Generating/PrefabPiecePool.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Generating/PrefabPiecePool.h') diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h index df5db3cd2..b9c1f0483 100644 --- a/src/Generating/PrefabPiecePool.h +++ b/src/Generating/PrefabPiecePool.h @@ -71,13 +71,13 @@ protected: /** Adds the prefab to the m_PiecesByConnector map for all its connectors. */ void AddToPerConnectorMap(cPrefab * a_Prefab); - // cPiecePool /*override*/s: - virtual cPieces GetPiecesWithConnector(int a_ConnectorType) /*override*/; - virtual cPieces GetStartingPieces(void) /*override*/; - virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) /*override*/; - virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) /*override*/; - virtual void PiecePlaced(const cPiece & a_Piece) /*override*/; - virtual void Reset(void) /*override*/; + // cPiecePool overrides: + virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override; + virtual cPieces GetStartingPieces(void) override; + virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) override; + virtual int GetStartingPieceWeight(const cPiece & a_NewPiece) override; + virtual void PiecePlaced(const cPiece & a_Piece) override; + virtual void Reset(void) override; } ; -- cgit v1.2.3