diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-20 22:55:07 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-10-23 05:12:49 +0200 |
| commit | a26541a7c3ced0569098edd0aae61c097c2912f4 (patch) | |
| tree | 4b7bea204c0ddd18bb4f95357f9eb77590bc2e8d /src/LightingThread.cpp | |
| parent | ComposableGenerator: Removed nullptr initializers. (diff) | |
| download | cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.gz cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.bz2 cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.lz cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.xz cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.zst cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.zip | |
Diffstat (limited to 'src/LightingThread.cpp')
| -rw-r--r-- | src/LightingThread.cpp | 8 |
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); } |