From a4a418a679f1ac760a8763edd856f0178cfc6dde Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Fri, 25 May 2012 07:18:52 +0000
Subject: Merged the composable_generator branch into the trunk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/WorldStorage.cpp | 65 ++++---------------------------------------------
 1 file changed, 5 insertions(+), 60 deletions(-)

(limited to 'source/WorldStorage.cpp')

diff --git a/source/WorldStorage.cpp b/source/WorldStorage.cpp
index e0e9e7c7b..16439d162 100644
--- a/source/WorldStorage.cpp
+++ b/source/WorldStorage.cpp
@@ -37,61 +37,6 @@ protected:
 
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cJsonChunkSerializer:
-
-cJsonChunkSerializer::cJsonChunkSerializer(void) :
-	m_HasJsonData(false)
-{
-	m_Root["Chests"]   = m_AllChests;
-	m_Root["Furnaces"] = m_AllFurnaces;
-	m_Root["Signs"]    = m_AllSigns;
-}
-
-
-
-
-
-void cJsonChunkSerializer::Entity(cEntity * a_Entity)
-{
-	// TODO: a_Entity->SaveToJson(m_Root);
-}
-
-
-
-
-
-void cJsonChunkSerializer::BlockEntity(cBlockEntity * a_BlockEntity)
-{
-	const char * SaveInto = NULL;
-	switch (a_BlockEntity->GetBlockType())
-	{
-		case E_BLOCK_CHEST:     SaveInto = "Chests";   break;
-		case E_BLOCK_FURNACE:   SaveInto = "Furnaces"; break;
-		case E_BLOCK_SIGN_POST: SaveInto = "Signs";    break;
-		case E_BLOCK_WALLSIGN:  SaveInto = "Signs";    break;
-		
-		default:
-		{
-			ASSERT(!"Unhandled blocktype in BlockEntities list while saving to JSON");
-			break;
-		}
-	}  // switch (BlockEntity->GetBlockType())
-	if (SaveInto == NULL)
-	{
-		return;
-	}
-	
-	Json::Value val;
-	a_BlockEntity->SaveToJson(val);
-	m_Root[SaveInto].append(val);
-	m_HasJsonData = true;
-}
-
-
-
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cWorldStorage:
 
@@ -332,13 +277,13 @@ bool cWorldStorage::LoadOneChunk(void)
 	bool ShouldLoad = false;
 	{
 		cCSLock Lock(m_CSQueues);
-		if (m_LoadQueue.size() > 0)
+		if (!m_LoadQueue.empty())
 		{
 			ToLoad = m_LoadQueue.front();
 			m_LoadQueue.pop_front();
 			ShouldLoad = true;
 		}
-		HasMore = (m_LoadQueue.size() > 0);
+		HasMore = !m_LoadQueue.empty();
 	}
 	
 	if (ShouldLoad && !LoadChunk(ToLoad.m_ChunkX, ToLoad.m_ChunkY, ToLoad.m_ChunkZ))
@@ -346,7 +291,7 @@ bool cWorldStorage::LoadOneChunk(void)
 		if (ToLoad.m_Generate)
 		{
 			// The chunk couldn't be loaded, generate it:
-			m_World->GetGenerator().GenerateChunk(ToLoad.m_ChunkX, ToLoad.m_ChunkY, ToLoad.m_ChunkZ);
+			m_World->GetGenerator().QueueGenerateChunk(ToLoad.m_ChunkX, ToLoad.m_ChunkY, ToLoad.m_ChunkZ);
 		}
 		else
 		{
@@ -368,13 +313,13 @@ bool cWorldStorage::SaveOneChunk(void)
 	bool ShouldSave = false;
 	{
 		cCSLock Lock(m_CSQueues);
-		if (m_SaveQueue.size() > 0)
+		if (!m_SaveQueue.empty())
 		{
 			Save = m_SaveQueue.front();
 			m_SaveQueue.pop_front();
 			ShouldSave = true;
 		}
-		HasMore = (m_SaveQueue.size() > 0);
+		HasMore = !m_SaveQueue.empty();
 	}
 	if (ShouldSave && m_World->IsChunkValid(Save.m_ChunkX, Save.m_ChunkY, Save.m_ChunkZ))
 	{
-- 
cgit v1.2.3