summaryrefslogtreecommitdiffstats
path: root/src/LightingThread.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-11-18 14:56:32 +0100
committerHowaner <franzi.moos@googlemail.com>2014-11-18 14:56:32 +0100
commit42120e2ea5db0cdb9920ff1c5efef33e0f496d48 (patch)
tree20ba1ae0a53f757cb8814b6cd6a466fe5acf1308 /src/LightingThread.cpp
parentFixed compile errors. (diff)
parentMerge pull request #1598 from mc-server/SignEditor (diff)
downloadcuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar
cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.gz
cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.bz2
cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.lz
cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.xz
cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.zst
cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.zip
Diffstat (limited to 'src/LightingThread.cpp')
-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);
}