From ee50790398791c38e563eee04cf12780fab74baf Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Mon, 16 Jun 2014 15:12:50 +0100
Subject: Merge branch 'master' of github.com:mc-server/MCServer

---
 src/ChunkMap.h | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'src/ChunkMap.h')

diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 7e85bb6f1..5aad0dd2a 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -351,7 +351,11 @@ private:
 	class cChunkLayer
 	{
 	public:
-		cChunkLayer(int a_LayerX, int a_LayerZ, cChunkMap * a_Parent);
+		cChunkLayer(
+			int a_LayerX, int a_LayerZ, 
+			cChunkMap * a_Parent,
+			cAllocationPool<cChunkData::sChunkSection> & a_Pool
+		);
 		~cChunkLayer();
 
 		/** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */
@@ -395,6 +399,25 @@ private:
 		int m_LayerZ;
 		cChunkMap * m_Parent;
 		int m_NumChunksLoaded;
+		
+		cAllocationPool<cChunkData::sChunkSection> & m_Pool;
+	};
+	
+	class cStarvationCallbacks
+		: public cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks
+	{
+		virtual void OnStartUsingReserve() override
+		{
+			LOG("Using backup memory buffer");
+		}
+		virtual void OnEndUsingReserve() override
+		{
+			LOG("Stoped using backup memory buffer");
+		}
+		virtual void OnOutOfReserve() override
+		{
+			LOG("Out of Memory");
+		}
 	};
 	
 	typedef std::list<cChunkLayer *> cChunkLayerList;
@@ -427,6 +450,8 @@ private:
 	/** The cChunkStay descendants that are currently enabled in this chunkmap */
 	cChunkStays m_ChunkStays;
 
+	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
 	cChunkPtr GetChunkNoLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ);  // Doesn't load, doesn't generate
-- 
cgit v1.2.3


From d379f27ea483a23bf6065e4bc668e82c915fa511 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 16 Jun 2014 16:51:30 +0200
Subject: Fixed gcc compilation.

---
 src/ChunkMap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ChunkMap.h')

diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 5aad0dd2a..f02dd3302 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -450,7 +450,7 @@ private:
 	/** The cChunkStay descendants that are currently enabled in this chunkmap */
 	cChunkStays m_ChunkStays;
 
-	std::auto_ptr<cAllocationPool<cChunkData::sChunkSection>> 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
-- 
cgit v1.2.3


From a89524d5330ffbdbaea1d38421dabe8d8f62999e Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 17 Jun 2014 01:15:38 +0200
Subject: Add DoWithBlockEntityAt() to WorldInterface.h

---
 src/ChunkMap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ChunkMap.h')

diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 9d973f2a9..adcf687c0 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -34,8 +34,8 @@ class cBlockArea;
 class cMobCensus;
 class cMobSpawner;
 
-typedef std::list<cClientHandle *>  cClientHandleList;
-typedef cChunk * cChunkPtr;
+typedef std::list<cClientHandle *>         cClientHandleList;
+typedef cChunk *                           cChunkPtr;
 typedef cItemCallback<cEntity>             cEntityCallback;
 typedef cItemCallback<cBlockEntity>        cBlockEntityCallback;
 typedef cItemCallback<cChestEntity>        cChestCallback;
-- 
cgit v1.2.3