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

@@ -244,7 +244,7 @@ public:
void SendLavaWaves(bool start)
{
Unit* cr = NULL;
Unit* cr = nullptr;
for (SummonList::const_iterator itr = summons.begin(); itr != summons.end(); ++itr)
{
cr = ObjectAccessor::GetUnit(*me, *itr);
@@ -262,7 +262,7 @@ public:
{
if (pInstance)
{
Unit* cr = NULL;
Unit* cr = nullptr;
for (uint8 i = 0; i < 3; ++i)
if ((cr = ObjectAccessor::GetUnit(*me, pInstance->GetData64(DATA_TENEBRON+i))))
{
@@ -301,7 +301,7 @@ public:
{
if (pInstance)
{
Creature* cr = NULL;
Creature* cr = nullptr;
for (uint8 i = 0; i < 3; ++i)
if (dragons[i])
if ((cr = ObjectAccessor::GetCreature(*me, dragons[i])))
@@ -482,7 +482,7 @@ void boss_sartharion::boss_sartharionAI::HandleSartharionAbilities()
if (!urand(0,2))
Talk(SAY_SARTHARION_SPECIAL_4);
Creature* cr = NULL;
Creature* cr = nullptr;
summons.RemoveNotExisting();
uint8 rand = urand(0,4); // 5 - numer of cyclones
uint8 iter = 0;
@@ -514,7 +514,7 @@ void boss_sartharion::boss_sartharionAI::HandleSartharionAbilities()
if (me->HealthBelowPct(11))
{
Creature* cr = NULL;
Creature* cr = nullptr;
summons.RemoveNotExisting();
for (SummonList::iterator i = summons.begin(); i != summons.end(); ++i)
{
@@ -765,7 +765,7 @@ public:
case EVENT_MINIBOSS_SPAWN_HELPERS:
{
Talk(WHISPER_HATCH_EGGS);
Creature* cr = NULL;
Creature* cr = nullptr;
for (uint8 i = 0; i < 6; ++i)
{
if ((cr = me->SummonCreature(NPC_TWILIGHT_EGG, EggsPos[isSartharion ? i+6 : i].GetPositionX(), EggsPos[isSartharion ? i+6 : i].GetPositionY(), EggsPos[isSartharion ? i+6 : i].GetPositionZ(), EggsPos[isSartharion ? i+6 : i].GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000)))
@@ -781,7 +781,7 @@ public:
}
case EVENT_MINIBOSS_HATCH_EGGS:
{
Creature* cr = NULL;
Creature* cr = nullptr;
summons.RemoveNotExisting();
summons.DespawnEntry(NPC_TWILIGHT_WHELP);
for (SummonList::iterator i = summons.begin(); i != summons.end(); ++i)

View File

@@ -374,8 +374,8 @@ class boss_halion : public CreatureScript
events.ScheduleEvent(EVENT_BREATH, urand(10000, 12000));
break;
case EVENT_ACTIVATE_FIREWALL:
instance->HandleGameObject(instance->GetData64(GO_FLAME_RING), false, NULL);
instance->HandleGameObject(instance->GetData64(GO_TWILIGHT_FLAME_RING), false, NULL);
instance->HandleGameObject(instance->GetData64(GO_FLAME_RING), false, nullptr);
instance->HandleGameObject(instance->GetData64(GO_TWILIGHT_FLAME_RING), false, nullptr);
break;
case EVENT_METEOR_STRIKE:
_livingEmberCount = summons.GetEntryCount(NPC_LIVING_EMBER);
@@ -988,7 +988,7 @@ class spell_halion_marks : public SpellScriptLoader
if (!GetTarget()->GetInstanceScript() || !GetTarget()->GetInstanceScript()->IsEncounterInProgress() || GetTarget()->GetMapId() != 724)
return;
GetTarget()->CastCustomSpell(_summonSpellId, SPELLVALUE_BASE_POINT1, GetAura()->GetStackAmount(), GetTarget(), TRIGGERED_FULL_MASK, NULL, NULL, GetCasterGUID());
GetTarget()->CastCustomSpell(_summonSpellId, SPELLVALUE_BASE_POINT1, GetAura()->GetStackAmount(), GetTarget(), TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
}
void Register()