summaryrefslogtreecommitdiffstats
path: root/src/game-server/mapmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/mapmanager.cpp')
-rw-r--r--src/game-server/mapmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp
index b3b2931..50f79cd 100644
--- a/src/game-server/mapmanager.cpp
+++ b/src/game-server/mapmanager.cpp
@@ -118,7 +118,7 @@ void MapManager::deinitialize()
MapComposite *MapManager::getMap(int mapId)
{
Maps::const_iterator i = maps.find(mapId);
- return (i != maps.end()) ? i->second : NULL;
+ return (i != maps.end()) ? i->second : nullptr;
}
MapComposite *MapManager::getMap(const std::string &mapName)
@@ -127,7 +127,7 @@ MapComposite *MapManager::getMap(const std::string &mapName)
if (i->second->getName() == mapName)
return i->second;
- return NULL;
+ return nullptr;
}
bool MapManager::activateMap(int mapId)