summaryrefslogtreecommitdiffstats
path: root/src/LightingThread.cpp
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-09-22 18:16:47 +0200
committerMattes D <github@xoft.cz>2017-10-21 19:33:22 +0200
commitc54bf40ef96806bf836db205f79e60d016b7eee9 (patch)
tree935dc6f8f18d86f21e6309947d4d09254f4c632a /src/LightingThread.cpp
parentcWorld: Move Initialization from Start to the constructor. (diff)
downloadcuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.tar
cuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.tar.gz
cuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.tar.bz2
cuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.tar.lz
cuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.tar.xz
cuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.tar.zst
cuberite-c54bf40ef96806bf836db205f79e60d016b7eee9.zip
Diffstat (limited to '')
-rw-r--r--src/LightingThread.cpp26
1 files changed, 6 insertions, 20 deletions
diff --git a/src/LightingThread.cpp b/src/LightingThread.cpp
index 302a7ba01..39b22f748 100644
--- a/src/LightingThread.cpp
+++ b/src/LightingThread.cpp
@@ -88,9 +88,9 @@ public:
////////////////////////////////////////////////////////////////////////////////
// cLightingThread:
-cLightingThread::cLightingThread(void) :
+cLightingThread::cLightingThread(cWorld & a_World):
super("cLightingThread"),
- m_World(nullptr),
+ m_World(a_World),
m_MaxHeight(0),
m_NumSeeds(0)
{
@@ -109,18 +109,6 @@ cLightingThread::~cLightingThread()
-bool cLightingThread::Start(cWorld * a_World)
-{
- ASSERT(m_World == nullptr); // Not started yet
- m_World = a_World;
-
- return super::Start();
-}
-
-
-
-
-
void cLightingThread::Stop(void)
{
{
@@ -150,8 +138,6 @@ void cLightingThread::Stop(void)
void cLightingThread::QueueChunk(int a_ChunkX, int a_ChunkZ, std::unique_ptr<cChunkCoordCallback> a_CallbackAfter)
{
- ASSERT(m_World != nullptr); // Did you call Start() properly?
-
cChunkStay * ChunkStay = new cLightingChunkStay(*this, a_ChunkX, a_ChunkZ, std::move(a_CallbackAfter));
{
// The ChunkStay will enqueue itself using the QueueChunkStay() once it is fully loaded
@@ -159,7 +145,7 @@ void cLightingThread::QueueChunk(int a_ChunkX, int a_ChunkZ, std::unique_ptr<cCh
cCSLock Lock(m_CS);
m_PendingQueue.push_back(ChunkStay);
}
- ChunkStay->Enable(*m_World->GetChunkMap());
+ ChunkStay->Enable(*m_World.GetChunkMap());
}
@@ -238,7 +224,7 @@ void cLightingThread::Execute(void)
void cLightingThread::LightChunk(cLightingChunkStay & a_Item)
{
// If the chunk is already lit, skip it (report as success):
- if (m_World->IsChunkLighted(a_Item.m_ChunkX, a_Item.m_ChunkZ))
+ if (m_World.IsChunkLighted(a_Item.m_ChunkX, a_Item.m_ChunkZ))
{
if (a_Item.m_CallbackAfter != nullptr)
{
@@ -319,7 +305,7 @@ void cLightingThread::LightChunk(cLightingChunkStay & a_Item)
CompressLight(m_BlockLight, BlockLight);
CompressLight(m_SkyLight, SkyLight);
- m_World->ChunkLighted(a_Item.m_ChunkX, a_Item.m_ChunkZ, BlockLight, SkyLight);
+ m_World.ChunkLighted(a_Item.m_ChunkX, a_Item.m_ChunkZ, BlockLight, SkyLight);
if (a_Item.m_CallbackAfter != nullptr)
{
@@ -341,7 +327,7 @@ void cLightingThread::ReadChunks(int a_ChunkX, int a_ChunkZ)
for (int x = 0; x < 3; x++)
{
Reader.m_ReadingChunkX = x;
- VERIFY(m_World->GetChunkData(a_ChunkX + x - 1, a_ChunkZ + z - 1, Reader));
+ VERIFY(m_World.GetChunkData(a_ChunkX + x - 1, a_ChunkZ + z - 1, Reader));
} // for z
} // for x