From 51a7465ae1227149da63b922900d014b2aeed009 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Wed, 20 Apr 2016 11:19:38 +0300 Subject: ChunkLayers now stored in std::map --- src/ChunkMap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ChunkMap.h') diff --git a/src/ChunkMap.h b/src/ChunkMap.h index 4f49572c6..8df76bde6 100644 --- a/src/ChunkMap.h +++ b/src/ChunkMap.h @@ -12,7 +12,6 @@ - class cWorld; class cWorldInterface; class cItem; @@ -68,7 +67,6 @@ public: static const int LAYER_SIZE = 32; cChunkMap(cWorld * a_World); - ~cChunkMap(); // Broadcast respective packets to all clients of the chunk where the event is taking place // (Please keep these alpha-sorted) @@ -424,6 +422,8 @@ private: ); ~cChunkLayer(); + cChunkLayer(const cChunkLayer & a_That) = delete; + /** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */ cChunkPtr GetChunk( int a_ChunkX, int a_ChunkZ); @@ -506,7 +506,7 @@ private: void RemoveLayer(cChunkLayer * a_Layer); cCriticalSection m_CSLayers; - cChunkLayerList m_Layers; + std::map, cChunkLayer> m_Layers; cEvent m_evtChunkValid; // Set whenever any chunk becomes valid, via ChunkValidated() cWorld * m_World; -- cgit v1.2.3