Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 04:12:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: ported headers cleanup from master branch

Browse Source
This commit is contained in:
ariel-
2017-06-19 23:20:06 -03:00
parent 052fc24315
commit 85a7d5ce9a
1207 changed files with 21154 additions and 18404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Maps/MapManager.cpp
View File

@@ -57,7 +57,7 @@ void MapManager::Initialize()
void MapManager::InitializeVisibilityDistanceInfo()
{
for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
for (MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end(); ++iter)
(*iter).second->InitVisibilityDistance();
}
@@ -71,7 +71,7 @@ Map* MapManager::CreateBaseMap(uint32 id)
{
Map* map = FindBaseMap(id);
if (map == NULL)
if (map == nullptr)
{
std::lock_guard<std::mutex> lock(_mapsLock);
@@ -98,7 +98,7 @@ Map* MapManager::FindBaseNonInstanceMap(uint32 mapId) const
{
Map* map = FindBaseMap(mapId);
if (map && map->Instanceable())
return NULL;
return nullptr;
return map;
}
@@ -116,10 +116,10 @@ Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const
{
Map* map = FindBaseMap(mapid);
if (!map)
return NULL;
return nullptr;
if (!map->Instanceable())
return instanceId == 0 ? map : NULL;
return instanceId == 0 ? map : nullptr;
return ((MapInstanced*)map)->FindInstanceMap(instanceId);
}