From 632e8680b181477ebf6713a593cc69d0193a425b Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 4 Jul 2014 11:50:50 +0200
Subject: Removed world-saving log messages.

Ref.: http://forum.mc-server.org/showthread.php?tid=1518
---
 src/World.cpp                     |  2 --
 src/WorldStorage/WorldStorage.cpp | 35 +++++------------------------------
 src/WorldStorage/WorldStorage.h   |  3 ---
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/src/World.cpp b/src/World.cpp
index bd7694e96..48c3448a3 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2776,10 +2776,8 @@ bool cWorld::ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a_MinChunk
 
 void cWorld::SaveAllChunks(void)
 {
-	LOGINFO("Saving all chunks...");
 	m_LastSave = m_WorldAge;
 	m_ChunkMap->SaveAllChunks();
-	m_Storage.QueueSavedMessage();
 }
 
 
diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp
index 6867ad5bc..d3f35384b 100644
--- a/src/WorldStorage/WorldStorage.cpp
+++ b/src/WorldStorage/WorldStorage.cpp
@@ -17,13 +17,6 @@
 
 
 
-/// If a chunk with this Y coord is de-queued, it is a signal to emit the saved-all message (cWorldStorage::QueueSavedMessage())
-#define CHUNK_Y_MESSAGE 2
-
-
-
-
-
 /// Example storage schema - forgets all chunks ;)
 class cWSSForgetful :
 	public cWSSchema
@@ -168,17 +161,6 @@ void cWorldStorage::QueueSaveChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
 
 
 
-void cWorldStorage::QueueSavedMessage(void)
-{
-	// Pushes a special coord pair into the queue, signalizing a message instead
-	m_SaveQueue.EnqueueItem(cChunkCoords(0, CHUNK_Y_MESSAGE, 0));
-	m_Event.Set();
-}
-
-
-
-
-
 void cWorldStorage::UnqueueLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
 {
 	m_LoadQueue.Remove(sChunkLoad(a_ChunkX, a_ChunkY, a_ChunkZ,true));
@@ -286,19 +268,12 @@ bool cWorldStorage::SaveOneChunk(void)
 {
 	cChunkCoords ToSave(0, 0, 0);
 	bool ShouldSave = m_SaveQueue.TryDequeueItem(ToSave);
-	if(ShouldSave) {
-		if (ToSave.m_ChunkY == CHUNK_Y_MESSAGE)
-		{
-			LOGINFO("Saved all chunks in world %s", m_World->GetName().c_str());
-			return ShouldSave;
-		}
-		if (ShouldSave && m_World->IsChunkValid(ToSave.m_ChunkX, ToSave.m_ChunkZ))
+	if (ShouldSave && m_World->IsChunkValid(ToSave.m_ChunkX, ToSave.m_ChunkZ))
+	{
+		m_World->MarkChunkSaving(ToSave.m_ChunkX, ToSave.m_ChunkZ);
+		if (m_SaveSchema->SaveChunk(ToSave))
 		{
-			m_World->MarkChunkSaving(ToSave.m_ChunkX, ToSave.m_ChunkZ);
-			if (m_SaveSchema->SaveChunk(ToSave))
-			{
-				m_World->MarkChunkSaved(ToSave.m_ChunkX, ToSave.m_ChunkZ);
-			}
+			m_World->MarkChunkSaved(ToSave.m_ChunkX, ToSave.m_ChunkZ);
 		}
 	}
 	return ShouldSave;
diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h
index bb189b6c9..1204b4310 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -67,9 +67,6 @@ public:
 	void QueueLoadChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, bool a_Generate);  // Queues the chunk for loading; if not loaded, the chunk will be generated if a_Generate is true
 	void QueueSaveChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
 	
-	/// Signals that a message should be output to the console when all the chunks have been saved
-	void QueueSavedMessage(void);
-	
 	/// Loads the chunk specified; returns true on success, false on failure
 	bool LoadChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
 
-- 
cgit v1.2.3