nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 02:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): NULL -> nullptr (#3275)

Browse Source 
* NULL to nullptr

* NULL to nullptr

* NULL to nullptr

* NULL to nullptr

* NULL to nullptr

Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
Kitzunu
2020-08-31 11:55:09 +02:00
committed by GitHub
parent 38903b5dfb
commit 1f89282b22
325 changed files with 2348 additions and 2348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/game/Maps/Map.cpp
View File

@@ -229,7 +229,7 @@ _transportsUpdateIter(_transports.end()), i_scriptLock(false), _defaultLight(Get
{
//z code
GridMaps[idx][j] =NULL;
setNGrid(NULL, idx, j);
setNGrid(nullptr, idx, j);
}
}
@@ -323,7 +323,7 @@ void Map::SwitchGridContainers(Creature* obj, bool on)
sLog->outStaticDebug("Switch object " UI64FMTD " from grid[%u, %u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on);
#endif
NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
ASSERT(ngrid != NULL);
ASSERT(ngrid != nullptr);
GridType &grid = ngrid->GetGridType(cell.CellX(), cell.CellY());
@@ -360,7 +360,7 @@ void Map::SwitchGridContainers(GameObject* obj, bool on)
//TC_LOG_DEBUG(LOG_FILTER_MAPS, "Switch object " UI64FMTD " from grid[%u, %u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on);
NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
ASSERT(ngrid != NULL);
ASSERT(ngrid != nullptr);
GridType &grid = ngrid->GetGridType(cell.CellX(), cell.CellY());
@@ -440,7 +440,7 @@ bool Map::EnsureGridLoaded(const Cell &cell)
EnsureGridCreated(GridCoord(cell.GridX(), cell.GridY()));
NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
ASSERT(grid != NULL);
ASSERT(grid != nullptr);
if (!isGridObjectDataLoaded(cell.GridX(), cell.GridY()))
{
//if (!isGridObjectDataLoaded(cell.GridX(), cell.GridY()))
@@ -1184,7 +1184,7 @@ bool Map::UnloadGrid(NGridType& ngrid)
ASSERT(i_objectsToRemove.empty());
delete &ngrid;
setNGrid(NULL, x, y);
setNGrid(nullptr, x, y);
int gx = (MAX_NUMBER_OF_GRIDS - 1) - x;
int gy = (MAX_NUMBER_OF_GRIDS - 1) - y;
@@ -1201,7 +1201,7 @@ bool Map::UnloadGrid(NGridType& ngrid)
MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(GetId(), gx, gy);
}
GridMaps[gx][gy] = NULL;
GridMaps[gx][gy] = nullptr;
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outStaticDebug("Unloading grid[%u, %u] for map %u finished", x, y, GetId());
@@ -1941,7 +1941,7 @@ Transport* Map::GetTransportForPos(uint32 phase, float x, float y, float z, Worl
return staticTrans->ToTransport();
}
return NULL;
return nullptr;
}
float Map::GetHeight(float x, float y, float z, bool checkVMap /*= true*/, float maxSearchDist /*= DEFAULT_HEIGHT_SEARCH*/) const
@@ -2536,7 +2536,7 @@ template void Map::RemoveFromMap(DynamicObject*, bool);
InstanceMap::InstanceMap(uint32 id, uint32 InstanceId, uint8 SpawnMode, Map* _parent)
: Map(id, InstanceId, SpawnMode, _parent),
m_resetAfterUnload(false), m_unloadWhenEmpty(false),
instance_script(NULL), i_script_id(0)
instance_script(nullptr), i_script_id(0)
{
//lets initialize visibility distance for dungeons
InstanceMap::InitVisibilityDistance();
@@ -2555,7 +2555,7 @@ InstanceMap::InstanceMap(uint32 id, uint32 InstanceId, uint8 SpawnMode, Map* _pa
InstanceMap::~InstanceMap()
{
delete instance_script;
instance_script = NULL;
instance_script = nullptr;
sInstanceSaveMgr->DeleteInstanceSaveIfNeeded(GetInstanceId(), true);
}
@@ -2706,7 +2706,7 @@ bool InstanceMap::AddPlayerToMap(Player* player)
// increase current instances (hourly limit)
// xinef: specific instances are still limited
if (!group || !group->isLFGGroup() || !group->IsLfgRandomInstance())
player->AddInstanceEnterTime(GetInstanceId(), time(NULL));
player->AddInstanceEnterTime(GetInstanceId(), time(nullptr));
if (!playerBind->perm && !mapSave->CanReset() && (!group || !group->isLFGGroup() || !group->IsLfgRandomInstance()))
{
@@ -2759,7 +2759,7 @@ void InstanceMap::AfterPlayerUnlinkFromMap()
void InstanceMap::CreateInstanceScript(bool load, std::string data, uint32 completedEncounterMask)
{
if (instance_script != NULL)
if (instance_script != nullptr)
return;
#ifdef ELUNA
bool isElunaAI = false;
@@ -2921,7 +2921,7 @@ uint32 InstanceMap::GetMaxResetDelay() const
/* ******* Battleground Instance Maps ******* */
BattlegroundMap::BattlegroundMap(uint32 id, uint32 InstanceId, Map* _parent, uint8 spawnMode)
: Map(id, InstanceId, spawnMode, _parent), m_bg(NULL)
: Map(id, InstanceId, spawnMode, _parent), m_bg(nullptr)
{
//lets initialize visibility distance for BG/Arenas
BattlegroundMap::InitVisibilityDistance();
@@ -2932,8 +2932,8 @@ BattlegroundMap::~BattlegroundMap()
if (m_bg)
{
//unlink to prevent crash, always unlink all pointer reference before destruction
m_bg->SetBgMap(NULL);
m_bg = NULL;
m_bg->SetBgMap(nullptr);
m_bg = nullptr;
}
}
@@ -3016,10 +3016,10 @@ GameObject* Map::GetGameObject(uint64 guid)
Transport* Map::GetTransport(uint64 guid)
{
if (GUID_HIPART(guid) != HIGHGUID_MO_TRANSPORT && GUID_HIPART(guid) != HIGHGUID_TRANSPORT)
return NULL;
return nullptr;
GameObject* go = GetGameObject(guid);
return go ? go->ToTransport() : NULL;
return go ? go->ToTransport() : nullptr;
}
DynamicObject* Map::GetDynamicObject(uint64 guid)
@@ -3052,7 +3052,7 @@ void Map::SaveCreatureRespawnTime(uint32 dbGuid, time_t& respawnTime)
return;
}
time_t now = time(NULL);
time_t now = time(nullptr);
if (GetInstanceResetPeriod() > 0 && respawnTime-now+5 >= GetInstanceResetPeriod())
respawnTime = now+YEAR;
@@ -3086,7 +3086,7 @@ void Map::SaveGORespawnTime(uint32 dbGuid, time_t& respawnTime)
return;
}
time_t now = time(NULL);
time_t now = time(nullptr);
if (GetInstanceResetPeriod() > 0 && respawnTime-now+5 >= GetInstanceResetPeriod())
respawnTime = now+YEAR;