From 187abe3f5e2219e0a80c0cdca4db362e223b60ae Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 26 Feb 2017 22:49:23 +0100 Subject: Gen: Moved PiecePool into a separate file. Also rewritten the PieceGenerator to use std::unique_ptr. --- src/Generating/PrefabStructure.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/Generating/PrefabStructure.cpp') diff --git a/src/Generating/PrefabStructure.cpp b/src/Generating/PrefabStructure.cpp index 3ebbe8143..c37398be9 100644 --- a/src/Generating/PrefabStructure.cpp +++ b/src/Generating/PrefabStructure.cpp @@ -14,11 +14,11 @@ cPrefabStructure::cPrefabStructure( int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, - cPlacedPieces & a_Pieces, + cPlacedPieces && a_Pieces, cTerrainHeightGenPtr a_HeightGen ): Super(a_GridX, a_GridZ, a_OriginX, a_OriginZ), - m_Pieces(a_Pieces), + m_Pieces(std::move(a_Pieces)), m_HeightGen(a_HeightGen) { } @@ -27,15 +27,6 @@ cPrefabStructure::cPrefabStructure( -cPrefabStructure::~cPrefabStructure() -{ - cPieceGenerator::FreePieces(m_Pieces); -} - - - - - void cPrefabStructure::DrawIntoChunk(cChunkDesc & a_Chunk) { // Iterate over all items @@ -47,7 +38,7 @@ void cPrefabStructure::DrawIntoChunk(cChunkDesc & a_Chunk) { PlacePieceOnGround(**itr); } - Prefab.Draw(a_Chunk, *itr); + Prefab.Draw(a_Chunk, itr->get()); } // for itr - m_PlacedPieces[] } -- cgit v1.2.3