summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-06-14 20:46:34 +0200
committerTycho <work.tycho+git@gmail.com>2014-06-14 20:46:34 +0200
commit94c48febd2f596648fc2616a8a577316a219b581 (patch)
tree3275d163808851c7413cd9abb5f3019788823fda /src/ChunkMap.h
parentreverted accedental android changes (diff)
downloadcuberite-94c48febd2f596648fc2616a8a577316a219b581.tar
cuberite-94c48febd2f596648fc2616a8a577316a219b581.tar.gz
cuberite-94c48febd2f596648fc2616a8a577316a219b581.tar.bz2
cuberite-94c48febd2f596648fc2616a8a577316a219b581.tar.lz
cuberite-94c48febd2f596648fc2616a8a577316a219b581.tar.xz
cuberite-94c48febd2f596648fc2616a8a577316a219b581.tar.zst
cuberite-94c48febd2f596648fc2616a8a577316a219b581.zip
Diffstat (limited to 'src/ChunkMap.h')
-rw-r--r--src/ChunkMap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 08156e7e6..c1dc743e5 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -352,7 +352,7 @@ private:
{
public:
cChunkLayer(int a_LayerX, int a_LayerZ, cChunkMap * a_Parent,
- cAllocationPool<cChunkData::sChunkSection, 1600> & a_Pool);
+ cAllocationPool<cChunkData::sChunkSection> & a_Pool);
~cChunkLayer();
/** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */
@@ -397,11 +397,11 @@ private:
cChunkMap * m_Parent;
int m_NumChunksLoaded;
- cAllocationPool<cChunkData::sChunkSection, 1600> & m_Pool;
+ cAllocationPool<cChunkData::sChunkSection> & m_Pool;
};
class cStarvationCallbacks
- : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks
+ : public cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks
{
virtual void OnStartingUsingBuffer()
{
@@ -447,7 +447,7 @@ private:
/** The cChunkStay descendants that are currently enabled in this chunkmap */
cChunkStays m_ChunkStays;
- cAllocationPool<cChunkData::sChunkSection, 1600> m_Pool;
+ std::auto_ptr<cAllocationPool<cChunkData::sChunkSection>> m_Pool;
cChunkPtr GetChunk (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading / generating if not valid
cChunkPtr GetChunkNoGen (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading if not valid; doesn't generate