1 files changed, 29 insertions, 15 deletions

diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 3d5af152c..d615456c1 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -27,6 +27,7 @@ const unsigned int QUEUE_SKIP_LIMIT = 500;
 
 cChunkGenerator::cChunkGenerator(void) :
 	super("cChunkGenerator"),
+	m_Seed(0),  // Will be overwritten by the actual generator
 	m_Generator(NULL),
 	m_PluginInterface(NULL),
 	m_ChunkSink(NULL)
@@ -51,10 +52,21 @@ bool cChunkGenerator::Start(cPluginInterface & a_PluginInterface, cChunkSink & a
 	m_PluginInterface = &a_PluginInterface;
 	m_ChunkSink = &a_ChunkSink;
 
-	MTRand rnd;
-	m_Seed = a_IniFile.GetValueSetI("Seed", "Seed", (int)rnd.randInt());
+	// Get the seed; create a new one and log it if not found in the INI file:
+	if (a_IniFile.HasValue("Seed", "Seed"))
+	{
+		m_Seed = a_IniFile.GetValueI("Seed", "Seed");
+	}
+	else
+	{
+		MTRand rnd;
+		m_Seed = rnd.randInt();
+		LOGINFO("Chosen a new random seed for world: %d", m_Seed);
+		a_IniFile.SetValueI("Seed", "Seed", m_Seed);
+	}
+	
+	// Get the generator engine based on the INI file settings:
 	AString GeneratorName = a_IniFile.GetValueSet("Generator", "Generator", "Composable");
-
 	if (NoCaseCompare(GeneratorName, "Noise3D") == 0)
 	{
 		m_Generator = new cNoise3DGenerator(*this);
@@ -98,15 +110,17 @@ void cChunkGenerator::Stop(void)
 
 
 
-void cChunkGenerator::QueueGenerateChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
+void cChunkGenerator::QueueGenerateChunk(int a_ChunkX, int a_ChunkZ, bool a_ForceGenerate)
 {
+	ASSERT(m_ChunkSink->IsChunkQueued(a_ChunkX, a_ChunkZ));
+
 	{
 		cCSLock Lock(m_CS);
 
 		// Check if it is already in the queue:
-		for (cChunkCoordsList::iterator itr = m_Queue.begin(); itr != m_Queue.end(); ++itr)
+		for (cChunkCoordsWithBoolList::iterator itr = m_Queue.begin(); itr != m_Queue.end(); ++itr)
 		{
-			if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkY == a_ChunkY) && (itr->m_ChunkZ == a_ChunkZ))
+			if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkZ == a_ChunkZ))
 			{
 				// Already in the queue, bail out
 				return;
@@ -118,7 +132,7 @@ void cChunkGenerator::QueueGenerateChunk(int a_ChunkX, int a_ChunkY, int a_Chunk
 		{
 			LOGWARN("WARNING: Adding chunk [%i, %i] to generation queue; Queue is too big! (" SIZE_T_FMT ")", a_ChunkX, a_ChunkZ, m_Queue.size());
 		}
-		m_Queue.push_back(cChunkCoords(a_ChunkX, a_ChunkY, a_ChunkZ));
+		m_Queue.push_back(cChunkCoordsWithBool(a_ChunkX, a_ChunkZ, a_ForceGenerate));
 	}
 
 	m_Event.Set();
@@ -228,9 +242,9 @@ void cChunkGenerator::Execute(void)
 			continue;
 		}
 
-		cChunkCoords coords = m_Queue.front();  // Get next coord from queue
-		m_Queue.erase( m_Queue.begin());  // Remove coordinate from queue
+		cChunkCoordsWithBool coords = m_Queue.front();  // Get next coord from queue
 		bool SkipEnabled = (m_Queue.size() > QUEUE_SKIP_LIMIT);
+		m_Queue.erase(m_Queue.begin());  // Remove coordinate from queue
 		Lock.Unlock();  // Unlock ASAP
 		m_evtRemoved.Set();
 
@@ -244,8 +258,7 @@ void cChunkGenerator::Execute(void)
 			LastReportTick = clock();
 		}
 
-		// Hack for regenerating chunks: if Y != 0, the chunk is considered invalid, even if it has its data set
-		if ((coords.m_ChunkY == 0) && m_ChunkSink->IsChunkValid(coords.m_ChunkX, coords.m_ChunkZ))
+		if (!coords.m_ForceGenerate && m_ChunkSink->IsChunkValid(coords.m_ChunkX, coords.m_ChunkZ))
 		{
 			LOGD("Chunk [%d, %d] already generated, skipping generation", coords.m_ChunkX, coords.m_ChunkZ);
 			// Already generated, ignore request
@@ -258,8 +271,8 @@ void cChunkGenerator::Execute(void)
 			continue;
 		}
 
-		LOGD("Generating chunk [%d, %d, %d]", coords.m_ChunkX, coords.m_ChunkY, coords.m_ChunkZ);
-		DoGenerate(coords.m_ChunkX, coords.m_ChunkY, coords.m_ChunkZ);
+		LOGD("Generating chunk [%d, %d]", coords.m_ChunkX, coords.m_ChunkZ);
+		DoGenerate(coords.m_ChunkX, coords.m_ChunkZ);
 
 		NumChunksGenerated++;
 	}  // while (!bStop)
@@ -268,11 +281,12 @@ void cChunkGenerator::Execute(void)
 
 
 
-void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
+void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ)
 {
 	ASSERT(m_PluginInterface != NULL);
 	ASSERT(m_ChunkSink != NULL);
-	
+	ASSERT(m_ChunkSink->IsChunkQueued(a_ChunkX, a_ChunkZ));
+
 	cChunkDesc ChunkDesc(a_ChunkX, a_ChunkZ);
 	m_PluginInterface->CallHookChunkGenerating(ChunkDesc);
 	m_Generator->DoGenerate(a_ChunkX, a_ChunkZ, ChunkDesc);