summaryrefslogtreecommitdiffstats
path: root/src/LightingThread.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-20 22:55:07 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-20 22:55:07 +0200
commit987f79afdd8945966d0dfa2d52539e005f771590 (patch)
treefa55849604121317e0a565465212032ebe4b79cb /src/LightingThread.cpp
parentUse std::recusive_mutex (diff)
downloadcuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.gz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.bz2
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.lz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.xz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.zst
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.zip
Diffstat (limited to '')
-rw-r--r--src/LightingThread.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/LightingThread.cpp b/src/LightingThread.cpp
index 652b03e46..ae5e746e7 100644
--- a/src/LightingThread.cpp
+++ b/src/LightingThread.cpp
@@ -91,7 +91,7 @@ public:
cLightingThread::cLightingThread(void) :
super("cLightingThread"),
- m_World(NULL),
+ m_World(nullptr),
m_MaxHeight(0),
m_NumSeeds(0)
{
@@ -112,7 +112,7 @@ cLightingThread::~cLightingThread()
bool cLightingThread::Start(cWorld * a_World)
{
- ASSERT(m_World == NULL); // Not started yet
+ ASSERT(m_World == nullptr); // Not started yet
m_World = a_World;
return super::Start();
@@ -151,7 +151,7 @@ void cLightingThread::Stop(void)
void cLightingThread::QueueChunk(int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter)
{
- ASSERT(m_World != NULL); // Did you call Start() properly?
+ ASSERT(m_World != nullptr); // Did you call Start() properly?
cChunkStay * ChunkStay = new cLightingChunkStay(*this, a_ChunkX, a_ChunkZ, a_CallbackAfter);
{
@@ -310,7 +310,7 @@ void cLightingThread::LightChunk(cLightingChunkStay & a_Item)
m_World->ChunkLighted(a_Item.m_ChunkX, a_Item.m_ChunkZ, BlockLight, SkyLight);
- if (a_Item.m_CallbackAfter != NULL)
+ if (a_Item.m_CallbackAfter != nullptr)
{
a_Item.m_CallbackAfter->Call(a_Item.m_ChunkX, a_Item.m_ChunkZ);
}