summaryrefslogtreecommitdiffstats
path: root/src/SetChunkData.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/SetChunkData.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 'src/SetChunkData.cpp')
-rw-r--r--src/SetChunkData.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/SetChunkData.cpp b/src/SetChunkData.cpp
index 707dfb9e8..e335176a8 100644
--- a/src/SetChunkData.cpp
+++ b/src/SetChunkData.cpp
@@ -42,15 +42,15 @@ cSetChunkData::cSetChunkData(
m_ShouldMarkDirty(a_ShouldMarkDirty)
{
// Check the params' validity:
- ASSERT(a_BlockTypes != NULL);
- ASSERT(a_BlockMetas != NULL);
+ ASSERT(a_BlockTypes != nullptr);
+ ASSERT(a_BlockMetas != nullptr);
// Copy block types and metas:
memcpy(m_BlockTypes, a_BlockTypes, sizeof(cChunkDef::BlockTypes));
memcpy(m_BlockMetas, a_BlockMetas, sizeof(cChunkDef::BlockNibbles));
// Copy lights, if both given:
- if ((a_BlockLight != NULL) && (a_SkyLight != NULL))
+ if ((a_BlockLight != nullptr) && (a_SkyLight != nullptr))
{
memcpy(m_BlockLight, a_BlockLight, sizeof(m_BlockLight));
memcpy(m_SkyLight, a_SkyLight, sizeof(m_SkyLight));
@@ -62,7 +62,7 @@ cSetChunkData::cSetChunkData(
}
// Copy the heightmap, if available:
- if (a_HeightMap != NULL)
+ if (a_HeightMap != nullptr)
{
memcpy(m_HeightMap, a_HeightMap, sizeof(m_HeightMap));
m_IsHeightMapValid = true;
@@ -73,7 +73,7 @@ cSetChunkData::cSetChunkData(
}
// Copy biomes, if available:
- if (a_Biomes != NULL)
+ if (a_Biomes != nullptr)
{
memcpy(m_Biomes, a_Biomes, sizeof(m_Biomes));
m_AreBiomesValid = true;