diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-20 22:55:07 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-20 22:55:07 +0200 |
commit | 987f79afdd8945966d0dfa2d52539e005f771590 (patch) | |
tree | fa55849604121317e0a565465212032ebe4b79cb /src/Generating/Prefab.cpp | |
parent | Use std::recusive_mutex (diff) | |
download | cuberite-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/Generating/Prefab.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Generating/Prefab.cpp b/src/Generating/Prefab.cpp index 6da3c3d10..761986690 100644 --- a/src/Generating/Prefab.cpp +++ b/src/Generating/Prefab.cpp @@ -328,7 +328,7 @@ void cPrefab::AddConnector(int a_RelX, int a_RelY, int a_RelZ, eBlockFace a_Dire void cPrefab::ParseCharMap(CharMap & a_CharMapOut, const char * a_CharMapDef) { - ASSERT(a_CharMapDef != NULL); + ASSERT(a_CharMapDef != nullptr); // Initialize the charmap to all-invalid values: for (size_t i = 0; i < ARRAYCOUNT(a_CharMapOut); i++) @@ -389,7 +389,7 @@ void cPrefab::ParseBlockImage(const CharMap & a_CharMap, const char * a_BlockIma void cPrefab::ParseConnectors(const char * a_ConnectorsDef) { - ASSERT(a_ConnectorsDef != NULL); + ASSERT(a_ConnectorsDef != nullptr); AStringVector Lines = StringSplitAndTrim(a_ConnectorsDef, "\n"); for (AStringVector::const_iterator itr = Lines.begin(), end = Lines.end(); itr != end; ++itr) @@ -436,7 +436,7 @@ void cPrefab::ParseConnectors(const char * a_ConnectorsDef) void cPrefab::ParseDepthWeight(const char * a_DepthWeightDef) { // The member needn't be defined at all, if so, skip: - if (a_DepthWeightDef == NULL) + if (a_DepthWeightDef == nullptr) { return; } |