diff options
| author | worktycho <work.tycho@gmail.com> | 2015-10-04 15:55:42 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2015-10-04 15:55:42 +0200 |
| commit | 0786fda18b08ee26a9bdcda7b17ef9979be4585a (patch) | |
| tree | 06ae98c7848c29b812b50b91ab4b2cbb49cd6e13 /src/Generating | |
| parent | Merge pull request #2519 from cuberite/RemoveStyleCheckFromTravis (diff) | |
| parent | Fixed a race condition between chunk loader and generator. (diff) | |
| download | cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.tar cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.tar.gz cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.tar.bz2 cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.tar.lz cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.tar.xz cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.tar.zst cuberite-0786fda18b08ee26a9bdcda7b17ef9979be4585a.zip | |
Diffstat (limited to 'src/Generating')
| -rw-r--r-- | src/Generating/ChunkGenerator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp index 741cdd7ae..bfa3344b9 100644 --- a/src/Generating/ChunkGenerator.cpp +++ b/src/Generating/ChunkGenerator.cpp @@ -248,13 +248,13 @@ void cChunkGenerator::Execute(void) LastReportTick = clock(); } - // Skip the chunk if it's already generated and regeneration is not forced: + // Skip the chunk if it's already generated and regeneration is not forced. Report as success: if (!item.m_ForceGenerate && m_ChunkSink->IsChunkValid(item.m_ChunkX, item.m_ChunkZ)) { LOGD("Chunk [%d, %d] already generated, skipping generation", item.m_ChunkX, item.m_ChunkZ); if (item.m_Callback != nullptr) { - item.m_Callback->Call(item.m_ChunkX, item.m_ChunkZ); + item.m_Callback->Call(item.m_ChunkX, item.m_ChunkZ, true); } continue; } @@ -265,7 +265,7 @@ void cChunkGenerator::Execute(void) LOGWARNING("Chunk generator overloaded, skipping chunk [%d, %d]", item.m_ChunkX, item.m_ChunkZ); if (item.m_Callback != nullptr) { - item.m_Callback->Call(item.m_ChunkX, item.m_ChunkZ); + item.m_Callback->Call(item.m_ChunkX, item.m_ChunkZ, false); } continue; } @@ -275,7 +275,7 @@ void cChunkGenerator::Execute(void) DoGenerate(item.m_ChunkX, item.m_ChunkZ); if (item.m_Callback != nullptr) { - item.m_Callback->Call(item.m_ChunkX, item.m_ChunkZ); + item.m_Callback->Call(item.m_ChunkX, item.m_ChunkZ, true); } NumChunksGenerated++; } // while (!bStop) @@ -296,8 +296,8 @@ void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ) m_PluginInterface->CallHookChunkGenerated(ChunkDesc); #ifdef _DEBUG - // Verify that the generator has produced valid data: - ChunkDesc.VerifyHeightmap(); + // Verify that the generator has produced valid data: + ChunkDesc.VerifyHeightmap(); #endif m_ChunkSink->OnChunkGenerated(ChunkDesc); |