diff options
| author | Mattes D <github@xoft.cz> | 2015-06-01 15:02:42 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-06-01 15:02:42 +0200 |
| commit | a54fa15bc6326d5482fae27b5fbcd42c8a34427a (patch) | |
| tree | 5b2bb45d000c25554b45cdd1aeea59a96734534a /src/ChunkMap.cpp | |
| parent | Merge pull request #2178 from jammet/patch-7 (diff) | |
| parent | Made cLightingThread own its callbacks (diff) | |
| download | cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.tar cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.tar.gz cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.tar.bz2 cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.tar.lz cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.tar.xz cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.tar.zst cuberite-a54fa15bc6326d5482fae27b5fbcd42c8a34427a.zip | |
Diffstat (limited to 'src/ChunkMap.cpp')
| -rw-r--r-- | src/ChunkMap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp index 44acc2013..2f38e4cd6 100644 --- a/src/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -2401,7 +2401,7 @@ void cChunkMap::TouchChunk(int a_ChunkX, int a_ChunkZ) -void cChunkMap::PrepareChunk(int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_Callback) +void cChunkMap::PrepareChunk(int a_ChunkX, int a_ChunkZ, std::unique_ptr<cChunkCoordCallback> a_Callback) { cCSLock Lock(m_CSLayers); cChunkPtr Chunk = GetChunkNoLoad(a_ChunkX, a_ChunkZ); @@ -2409,7 +2409,7 @@ void cChunkMap::PrepareChunk(int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a // If the chunk is not prepared, queue it in the lighting thread, that will do all the needed processing: if ((Chunk == nullptr) || !Chunk->IsValid() || !Chunk->IsLightValid()) { - m_World->GetLightingThread().QueueChunk(a_ChunkX, a_ChunkZ, a_Callback); + m_World->GetLightingThread().QueueChunk(a_ChunkX, a_ChunkZ, std::move(a_Callback)); return; } |