summaryrefslogtreecommitdiffstats
path: root/src/MapManager.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/MapManager.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/MapManager.cpp')
-rw-r--r--src/MapManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/MapManager.cpp b/src/MapManager.cpp
index e7df75118..2a3ab192b 100644
--- a/src/MapManager.cpp
+++ b/src/MapManager.cpp
@@ -15,7 +15,7 @@
cMapManager::cMapManager(cWorld * a_World)
: m_World(a_World)
{
- ASSERT(m_World != NULL);
+ ASSERT(m_World != nullptr);
}
@@ -27,7 +27,7 @@ bool cMapManager::DoWithMap(int a_ID, cMapCallback & a_Callback)
cCSLock Lock(m_CS);
cMap * Map = GetMapData(a_ID);
- if (Map == NULL)
+ if (Map == nullptr)
{
return false;
}
@@ -68,7 +68,7 @@ cMap * cMapManager::GetMapData(unsigned int a_ID)
}
else
{
- return NULL;
+ return nullptr;
}
}
@@ -83,7 +83,7 @@ cMap * cMapManager::CreateMap(int a_CenterX, int a_CenterY, int a_Scale)
if (m_MapData.size() >= 65536)
{
LOGWARN("Could not craft map - Too many maps in use");
- return NULL;
+ return nullptr;
}
cMap Map((unsigned)m_MapData.size(), a_CenterX, a_CenterY, m_World, a_Scale);