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

* 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

View File

@@ -63,7 +63,7 @@ GraveyardStruct const* Graveyard::GetGraveyard(uint32 ID) const
if (itr != _graveyardStore.end())
return &itr->second;
return NULL;
return nullptr;
}
GraveyardStruct const* Graveyard::GetDefaultGraveyard(TeamId teamId)
@@ -111,15 +111,15 @@ GraveyardStruct const* Graveyard::GetClosestGraveyard(float x, float y, float z,
// at corpse map
bool foundNear = false;
float distNear = 10000;
GraveyardStruct const* entryNear = NULL;
GraveyardStruct const* entryNear = nullptr;
// at entrance map for corpse map
bool foundEntr = false;
float distEntr = 10000;
GraveyardStruct const* entryEntr = NULL;
GraveyardStruct const* entryEntr = nullptr;
// some where other
GraveyardStruct const* entryFar = NULL;
GraveyardStruct const* entryFar = nullptr;
MapEntry const* mapEntry = sMapStore.LookupEntry(MapId);
@@ -210,7 +210,7 @@ GraveyardData const* Graveyard::FindGraveyardData(uint32 id, uint32 zoneId)
return &data;
}
return NULL;
return nullptr;
}
bool Graveyard::AddGraveyardLink(uint32 id, uint32 zoneId, TeamId teamId, bool persist /*= true*/)
@@ -359,13 +359,13 @@ GraveyardStruct const* Graveyard::GetGraveyard(const std::string& name) const
// explicit name case
std::wstring wname;
if (!Utf8toWStr(name, wname))
return NULL;
return nullptr;
// converting string that we try to find to lower case
wstrToLower(wname);
// Alternative first GameTele what contains wnameLow as substring in case no GameTele location found
const GraveyardStruct* alt = NULL;
const GraveyardStruct* alt = nullptr;
for (GraveyardContainer::const_iterator itr = _graveyardStore.begin(); itr != _graveyardStore.end(); ++itr)
{
if (itr->second.wnameLow == wname)