diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-04-24 16:59:20 +0200 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-04-24 16:59:20 +0200 |
commit | 828889b89076c27ddd8a50d48995a65dbd6a71de (patch) | |
tree | 461274297825de3958ee63cd236e319acd652bab /src/ChunkMap.h | |
parent | Merge pull request #3153 from LogicParrot/chunkLayer (diff) | |
parent | Revert "ChunkLayers now stored in std::map" (diff) | |
download | cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.tar cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.tar.gz cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.tar.bz2 cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.tar.lz cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.tar.xz cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.tar.zst cuberite-828889b89076c27ddd8a50d48995a65dbd6a71de.zip |
Diffstat (limited to 'src/ChunkMap.h')
-rw-r--r-- | src/ChunkMap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChunkMap.h b/src/ChunkMap.h index 8df76bde6..4f49572c6 100644 --- a/src/ChunkMap.h +++ b/src/ChunkMap.h @@ -12,6 +12,7 @@ + class cWorld; class cWorldInterface; class cItem; @@ -67,6 +68,7 @@ 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) @@ -422,8 +424,6 @@ 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; - std::map<std::pair<int, int>, cChunkLayer> m_Layers; + cChunkLayerList m_Layers; cEvent m_evtChunkValid; // Set whenever any chunk becomes valid, via ChunkValidated() cWorld * m_World; |