1 files changed, 133 insertions, 14 deletions

diff --git a/src/ChunkBuffer.cpp b/src/ChunkBuffer.cpp
index 8e87d3049..7946fba1e 100644
--- a/src/ChunkBuffer.cpp
+++ b/src/ChunkBuffer.cpp
@@ -22,7 +22,7 @@ cChunkBuffer cChunkBuffer::Copy() const
 
 void cChunkBuffer::CopyBlocks   (BLOCKTYPE * a_dest, size_t a_Idx, size_t length)  const
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length =  CHUNK_SECTION_HEIGHT * 16 * 16;
 		if (a_Idx > 0) a_Idx = a_Idx > length ? a_Idx - length : 0;
@@ -30,7 +30,22 @@ void cChunkBuffer::CopyBlocks   (BLOCKTYPE * a_dest, size_t a_Idx, size_t length
 		{
 			size_t tocopy = length > segment_length ? segment_length : length;
 			length -= tocopy;
-			memcpy(&a_dest[i * segment_length], &m_Sections[i]->m_BlockTypes, sizeof(BLOCKTYPE) * length);
+			if(m_Sections[i])
+			{
+				memcpy(
+					&a_dest[i * segment_length],
+					&m_Sections[i]->m_BlockTypes, 
+					sizeof(BLOCKTYPE) * length
+				);
+			}
+			else
+			{
+				memset(
+					&a_dest[i * segment_length],
+					0,
+					sizeof(BLOCKTYPE) * length
+				);
+			}
 		}
 	}
 }
@@ -41,10 +56,24 @@ void cChunkBuffer::CopyBlocks   (BLOCKTYPE * a_dest, size_t a_Idx, size_t length
 
 void cChunkBuffer::CopyMeta(NIBBLETYPE * a_dest) const
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
-		memcpy(&a_dest[i * segment_length], &m_Sections[i]->m_BlockMeta, sizeof(NIBBLETYPE) * segment_length);
+		if(m_Sections[i])
+		{
+			memcpy(
+				&a_dest[i * segment_length], 
+				&m_Sections[i]->m_BlockMeta, 
+				sizeof(NIBBLETYPE) * segment_length);
+		}
+		else
+		{
+			memset(
+				&a_dest[i * segment_length],
+				0,
+				sizeof(BLOCKTYPE) * segment_length
+			);
+		}
 	}
 }
 
@@ -54,10 +83,25 @@ void cChunkBuffer::CopyMeta(NIBBLETYPE * a_dest) const
 
 void cChunkBuffer::CopyLight(NIBBLETYPE * a_dest) const
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
-		memcpy(&a_dest[i * segment_length], &m_Sections[i]->m_BlockLight, sizeof(NIBBLETYPE) * segment_length);
+		if(m_Sections[i])
+		{
+			memcpy(
+				&a_dest[i * segment_length],
+				&m_Sections[i]->m_BlockLight,
+				sizeof(NIBBLETYPE) * segment_length
+			);
+		}
+		else
+		{
+			memset(
+				&a_dest[i * segment_length],
+				0,
+				sizeof(BLOCKTYPE) * segment_length
+			);
+		}
 	}
 }
 
@@ -67,10 +111,25 @@ void cChunkBuffer::CopyLight(NIBBLETYPE * a_dest) const
 
 void cChunkBuffer::CopySkyLight(NIBBLETYPE * a_dest) const
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
-		memcpy(&a_dest[i * segment_length], &m_Sections[i]->m_BlockSkyLight, sizeof(NIBBLETYPE) * segment_length);
+		if(m_Sections[i])
+		{
+			memcpy(
+				&a_dest[i * segment_length],
+				&m_Sections[i]->m_BlockSkyLight,
+				sizeof(NIBBLETYPE) * segment_length
+			);
+		}
+		else
+		{
+			memset(
+				&a_dest[i * segment_length],
+				0xFF,
+				sizeof(BLOCKTYPE) * segment_length
+			);
+		}
 	}
 }
 
@@ -80,13 +139,28 @@ void cChunkBuffer::CopySkyLight(NIBBLETYPE * a_dest) const
 
 void cChunkBuffer::SetBlocks(const BLOCKTYPE * a_src)
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
 		if (m_Sections[i])
 		{
 			memcpy(&m_Sections[i]->m_BlockTypes, &a_src[i * segment_length], sizeof(BLOCKTYPE) * segment_length);
 		}
+		else
+		{
+			size_t j = 0;
+			// do nothing whilst 0
+			for (; j < segment_length && a_src[i * segment_length + j] == 0; j++);
+			if (j != segment_length)
+			{
+				m_Sections[i] = Allocate();
+				memcpy(
+					&m_Sections[i]->m_BlockTypes, 
+					&a_src[i * segment_length],
+					sizeof(BLOCKTYPE) * segment_length
+					);
+			}
+		}
 	} 
 }
 
@@ -95,13 +169,28 @@ void cChunkBuffer::SetBlocks(const BLOCKTYPE * a_src)
 
 void cChunkBuffer::SetMeta(const NIBBLETYPE * a_src)
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
 		if (m_Sections[i])
 		{
 			memcpy(&m_Sections[i]->m_BlockMeta, &a_src[i * segment_length], sizeof(NIBBLETYPE) * segment_length);
 		}
+		else
+		{
+			size_t j = 0;
+			// do nothing whilst 0
+			for (; j < segment_length && a_src[i * segment_length + j] == 0; j++);
+			if (j != segment_length)
+			{
+				m_Sections[i] = Allocate();
+				memcpy(
+					&m_Sections[i]->m_BlockTypes, 
+					&a_src[i * segment_length],
+					sizeof(BLOCKTYPE) * segment_length
+					);
+			}
+		}
 	} 
 }
 
@@ -110,14 +199,29 @@ void cChunkBuffer::SetMeta(const NIBBLETYPE * a_src)
 
 void cChunkBuffer::SetLight(const NIBBLETYPE * a_src)
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
 		if (m_Sections[i])
 		{
 			memcpy(&m_Sections[i]->m_BlockLight, &a_src[i * segment_length], sizeof(NIBBLETYPE) * segment_length);
 		}
-	} 
+		else
+		{
+			size_t j = 0;
+			// do nothing whilst 0
+			for (; j < segment_length && a_src[i * segment_length + j] == 0; j++);
+			if (j != segment_length)
+			{
+				m_Sections[i] = Allocate();
+				memcpy(
+					&m_Sections[i]->m_BlockTypes, 
+					&a_src[i * segment_length],
+					sizeof(BLOCKTYPE) * segment_length
+					);
+			}
+		}
+	}
 }
 
 
@@ -125,14 +229,29 @@ void cChunkBuffer::SetLight(const NIBBLETYPE * a_src)
 
 void cChunkBuffer::SetSkyLight  (const NIBBLETYPE * a_src)
 {
-	for (int i = 0; i < CHUNK_SECTION_NUM; i++)
+	for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
 	{
 		const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
 		if (m_Sections[i])
 		{
 			memcpy(&m_Sections[i]->m_BlockSkyLight, &a_src[i * segment_length], sizeof(NIBBLETYPE) * segment_length);
 		}
-	} 
+		else
+		{
+			size_t j = 0;
+			// do nothing whilst 0
+			for (; j < segment_length && a_src[i * segment_length + j] == 0xFF; j++);
+			if (j != segment_length)
+			{
+				m_Sections[i] = Allocate();
+				memcpy(
+					&m_Sections[i]->m_BlockTypes, 
+					&a_src[i * segment_length],
+					sizeof(BLOCKTYPE) * segment_length
+					);
+			}
+		}
+	}
 }