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

refactor(Core): replace NULL with nullptr (#4593)

Browse Source
This commit is contained in:
Kitzunu
2021-03-02 01:34:20 +01:00
committed by GitHub
parent dbefa17a53
commit 28f1dc5c0c
231 changed files with 923 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,11 +185,11 @@ void Map::LoadMap(int gx, int gy, bool reload)
sScriptMgr->OnUnloadGridMap(this, GridMaps[gx][gy], gx, gy);
delete (GridMaps[gx][gy]);
GridMaps[gx][gy] = NULL;
GridMaps[gx][gy] = nullptr;
}
// map file name
char* tmp = NULL;
char* tmp = nullptr;
int len = sWorld->GetDataPath().length() + strlen("maps/%03u%02u%02u.map") + 1;
tmp = new char[len];
snprintf(tmp, len, (char*)(sWorld->GetDataPath() + "maps/%03u%02u%02u.map").c_str(), GetId(), gx, gy);
@@ -229,7 +229,7 @@ Map::Map(uint32 id, uint32 InstanceId, uint8 SpawnMode, Map* _parent) :
for (unsigned int j = 0; j < MAX_NUMBER_OF_GRIDS; ++j)
{
//z code
GridMaps[idx][j] = NULL;
GridMaps[idx][j] = nullptr;
setNGrid(nullptr, idx, j);
}
}
@@ -1909,7 +1909,7 @@ GridMap* Map::GetGrid(float x, float y)
return GridMaps[gx][gy];
}
float Map::GetWaterOrGroundLevel(uint32 phasemask, float x, float y, float z, float* ground /*= NULL*/, bool /*swim = false*/, float collisionHeight) const
float Map::GetWaterOrGroundLevel(uint32 phasemask, float x, float y, float z, float* ground /*= nullptr*/, bool /*swim = false*/, float collisionHeight) const
{
if (const_cast<Map*>(this)->GetGrid(x, y))
{
@@ -3056,17 +3056,17 @@ void BattlegroundMap::RemoveAllPlayers()
Player* Map::GetPlayer(uint64 guid)
{
return ObjectAccessor::GetObjectInMap(guid, this, (Player*)NULL);
return ObjectAccessor::GetObjectInMap(guid, this, (Player*)nullptr);
}
Creature* Map::GetCreature(uint64 guid)
{
return ObjectAccessor::GetObjectInMap(guid, this, (Creature*)NULL);
return ObjectAccessor::GetObjectInMap(guid, this, (Creature*)nullptr);
}
GameObject* Map::GetGameObject(uint64 guid)
{
return ObjectAccessor::GetObjectInMap(guid, this, (GameObject*)NULL);
return ObjectAccessor::GetObjectInMap(guid, this, (GameObject*)nullptr);
}
Transport* Map::GetTransport(uint64 guid)
@@ -3080,17 +3080,17 @@ Transport* Map::GetTransport(uint64 guid)
DynamicObject* Map::GetDynamicObject(uint64 guid)
{
return ObjectAccessor::GetObjectInMap(guid, this, (DynamicObject*)NULL);
return ObjectAccessor::GetObjectInMap(guid, this, (DynamicObject*)nullptr);
}
Pet* Map::GetPet(uint64 guid)
{
return ObjectAccessor::GetObjectInMap(guid, this, (Pet*)NULL);
return ObjectAccessor::GetObjectInMap(guid, this, (Pet*)nullptr);
}
Corpse* Map::GetCorpse(uint64 guid)
{
return ObjectAccessor::GetObjectInMap(guid, this, (Corpse*)NULL);
return ObjectAccessor::GetObjectInMap(guid, this, (Corpse*)nullptr);
}
void Map::UpdateIteratorBack(Player* player)