diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/game-server/mapmanager.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/mapmanager.cpp')
| -rw-r--r-- | src/game-server/mapmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp index b3b2931d..50f79cd0 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) |