flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed formatting. Moved UnloadUnusedChunks from public to private.

Browse Source
This commit is contained in:
narroo 2014-02-11 14:38:28 -05:00
parent 03dbfce10e
commit e53b331b4a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/World.cpp
View File

@ -2966,6 +2966,7 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cWorld::cTaskSaveAllChunks: // cWorld::cTaskSaveAllChunks:
@ -2975,6 +2976,9 @@ void cWorld::cTaskSaveAllChunks::Run(cWorld & a_World)
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cWorld::cTaskUnloadUnusedChunks // cWorld::cTaskUnloadUnusedChunks
@ -2984,6 +2988,9 @@ void cWorld::cTaskUnloadUnusedChunks::Run(cWorld & a_World)
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cWorld::cChunkGeneratorCallbacks: // cWorld::cChunkGeneratorCallbacks:

7
src/World.h
View File

@ -252,10 +252,6 @@ public:
bool IsChunkValid (int a_ChunkX, int a_ChunkZ) const; bool IsChunkValid (int a_ChunkX, int a_ChunkZ) const;
bool HasChunkAnyClients(int a_ChunkX, int a_ChunkZ) const; bool HasChunkAnyClients(int a_ChunkX, int a_ChunkZ) const;
/** Unloads all chunks immediately. Dangerous interface, may deadlock, use QueueUnloadUnusedChunks() instead*/
void UnloadUnusedChunks(void);
/** Queues a task to unload unused chunks onto the tick thread. The prefferred way of unloading*/ /** Queues a task to unload unused chunks onto the tick thread. The prefferred way of unloading*/
void QueueUnloadUnusedChunks(void); // tolua_export void QueueUnloadUnusedChunks(void); // tolua_export
@ -882,6 +878,9 @@ private:
/** Ticks all clients that are in this world */ /** Ticks all clients that are in this world */
void TickClients(float a_Dt); void TickClients(float a_Dt);
/** Unloads all chunks immediately.*/
void UnloadUnusedChunks(void);
void UpdateSkyDarkness(void); void UpdateSkyDarkness(void);
/** <summary>Generates a random spawnpoint on solid land by walking chunks and finding their biomes</summary> */ /** <summary>Generates a random spawnpoint on solid land by walking chunks and finding their biomes</summary> */