Merged branch 'narroo/master'.

This merges pull request #661.
2014-02-13 17:04:25 +01:00
parent 41ab8260f7 972919589b
commit 9bb48a8fa4
5 changed files with 39 additions and 4 deletions
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2213,6 +2213,15 @@ void cWorld::UnloadUnusedChunks(void)



+void cWorld::QueueUnloadUnusedChunks(void)
+{
+	QueueTask(new cWorld::cTaskUnloadUnusedChunks);
+}
+
+
+
+
+
 void cWorld::CollectPickupsByPlayer(cPlayer * a_Player)
 {
 	m_ChunkMap->CollectPickupsByPlayer(a_Player);
@@ -2945,6 +2954,7 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c



+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cWorld::cTaskSaveAllChunks:

@@ -2957,6 +2967,18 @@ void cWorld::cTaskSaveAllChunks::Run(cWorld & a_World)



+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cWorld::cTaskUnloadUnusedChunks
+
+void cWorld::cTaskUnloadUnusedChunks::Run(cWorld & a_World)
+{
+	a_World.UnloadUnusedChunks();
+}
+
+
+
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cWorld::cChunkGeneratorCallbacks: