diff options
author | Masy98 <masy@antheruscraft.de> | 2014-09-05 11:27:21 +0200 |
---|---|---|
committer | Masy98 <masy@antheruscraft.de> | 2014-09-05 11:27:21 +0200 |
commit | 15bee41a3657498e0072007e24abec50aac2c8df (patch) | |
tree | 863ae0ba1fef38d5da79aeb357e955c52d838caa /src/Generating/ChunkGenerator.h | |
parent | Added new recipes! (diff) | |
parent | Merge pull request #1375 from mc-server/EntitiesInBox (diff) | |
download | cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.gz cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.bz2 cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.lz cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.xz cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.zst cuberite-15bee41a3657498e0072007e24abec50aac2c8df.zip |
Diffstat (limited to 'src/Generating/ChunkGenerator.h')
-rw-r--r-- | src/Generating/ChunkGenerator.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h index 88d71f3f9..e880a6766 100644 --- a/src/Generating/ChunkGenerator.h +++ b/src/Generating/ChunkGenerator.h @@ -116,7 +116,7 @@ public: void Stop(void); /// Queues the chunk for generation; removes duplicate requests - void QueueGenerateChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ); + void QueueGenerateChunk(int a_ChunkX, int a_ChunkZ, bool a_ForceGenerate); /// Generates the biomes for the specified chunk (directly, not in a separate thread). Used by the world loader if biomes failed loading. void GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap); @@ -137,10 +137,10 @@ private: int m_Seed; - cCriticalSection m_CS; - cChunkCoordsList m_Queue; - cEvent m_Event; ///< Set when an item is added to the queue or the thread should terminate - cEvent m_evtRemoved; ///< Set when an item is removed from the queue + cCriticalSection m_CS; + cChunkCoordsWithBoolList m_Queue; + cEvent m_Event; ///< Set when an item is added to the queue or the thread should terminate + cEvent m_evtRemoved; ///< Set when an item is removed from the queue cGenerator * m_Generator; ///< The actual generator engine used to generate chunks @@ -154,7 +154,7 @@ private: // cIsThread override: virtual void Execute(void) override; - void DoGenerate(int a_ChunkX, int a_ChunkY, int a_ChunkZ); + void DoGenerate(int a_ChunkX, int a_ChunkZ); }; |