summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-05-28 16:33:10 +0200
committermadmaxoft <github@xoft.cz>2014-05-28 16:33:10 +0200
commitd29b242674fbf89035c8908753496522edf8eaee (patch)
tree75fabddd035865f096fdac598fb946051fab49bf
parentStuff. (diff)
downloadcuberite-d29b242674fbf89035c8908753496522edf8eaee.tar
cuberite-d29b242674fbf89035c8908753496522edf8eaee.tar.gz
cuberite-d29b242674fbf89035c8908753496522edf8eaee.tar.bz2
cuberite-d29b242674fbf89035c8908753496522edf8eaee.tar.lz
cuberite-d29b242674fbf89035c8908753496522edf8eaee.tar.xz
cuberite-d29b242674fbf89035c8908753496522edf8eaee.tar.zst
cuberite-d29b242674fbf89035c8908753496522edf8eaee.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/PrefabPiecePool.cpp28
-rw-r--r--src/Generating/PrefabPiecePool.h7
2 files changed, 34 insertions, 1 deletions
diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp
index ed9340815..145474bcc 100644
--- a/src/Generating/PrefabPiecePool.cpp
+++ b/src/Generating/PrefabPiecePool.cpp
@@ -26,6 +26,34 @@ cPrefabPiecePool::cPrefabPiecePool(
+cPrefabPiecePool::~cPrefabPiecePool()
+{
+ Clear();
+}
+
+
+
+
+
+void cPrefabPiecePool::Clear(void)
+{
+ m_PiecesByConnector.clear();
+ for (cPieces::iterator itr = m_AllPieces.begin(), end = m_AllPieces.end(); itr != end; ++itr)
+ {
+ delete *itr;
+ }
+ m_AllPieces.clear();
+ for (cPieces::iterator itr = m_StartingPieces.begin(), end = m_StartingPieces.end(); itr != end; ++itr)
+ {
+ delete *itr;
+ }
+ m_StartingPieces.clear();
+}
+
+
+
+
+
void cPrefabPiecePool::AddPieceDefs(const cPrefab::sDef * a_PieceDefs, size_t a_NumPieceDefs)
{
ASSERT(a_PieceDefs != NULL);
diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h
index c6a5ad360..50ae63c0c 100644
--- a/src/Generating/PrefabPiecePool.h
+++ b/src/Generating/PrefabPiecePool.h
@@ -34,6 +34,12 @@ public:
const cPrefab::sDef * a_StartingPieceDefs, size_t a_NumStartingPieceDefs
);
+ /** Destroys the pool, freeing all pieces. */
+ ~cPrefabPiecePool();
+
+ /** Removes and frees all pieces from this pool. */
+ void Clear(void);
+
/** Adds pieces from the specified definitions into m_AllPieces. Also adds the pieces into
the m_PiecesByConnector map.
May be called multiple times with different PieceDefs, will add all such pieces. */
@@ -44,7 +50,6 @@ public:
May be called multiple times with different PieceDefs, will add all such pieces. */
void AddStartingPieceDefs(const cPrefab::sDef * a_StartingPieceDefs, size_t a_NumStartingPieceDefs);
-
protected:
/** The type used to map a connector type to the list of pieces with that connector */