nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 20:56:23 +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

4
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
View File

@@ -115,7 +115,7 @@ public:
break;
case EVENT_DEFILING_HORROR:
Talk(SAY_DEFILING_HORROR);
me->CastSpell((Unit*)NULL, SPELL_DEFILING_HORROR, false);
me->CastSpell((Unit*)nullptr, SPELL_DEFILING_HORROR, false);
me->SetControlled(true, UNIT_STATE_ROOT);
events.DelayEventsToMax(5000, 0);
events.ScheduleEvent(EVENT_UNROOT, 4000);
@@ -130,7 +130,7 @@ public:
{
if (uiHopelessnessCount)
me->RemoveOwnedAura(hopelessnessId[uiHopelessnessCount - 1][DUNGEON_MODE(0, 1)]);
me->CastSpell((Unit*)NULL, hopelessnessId[uiHopelessnessCount][DUNGEON_MODE(0, 1)], true);
me->CastSpell((Unit*)nullptr, hopelessnessId[uiHopelessnessCount][DUNGEON_MODE(0, 1)], true);
++uiHopelessnessCount;
}

4
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
View File

@@ -114,7 +114,7 @@ public:
break;
case EVENT_CORRUPTED_FLESH:
Talk(RAND(SAY_CORRUPTED_FLESH_1, SAY_CORRUPTED_FLESH_2));
me->CastSpell((Unit*)NULL, SPELL_CORRUPTED_FLESH, false);
me->CastSpell((Unit*)nullptr, SPELL_CORRUPTED_FLESH, false);
events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000);
break;
case EVENT_SHARED_SUFFERING:
@@ -180,7 +180,7 @@ public:
++count;
ticks = (a->GetDuration() / int32(a->GetSpellInfo()->Effects[0].Amplitude)) + 1;
int32 dmg = (ticks * dmgPerTick) / count;
caster->CastCustomSpell(GetTarget(), 72373, NULL, &dmg, NULL, true);
caster->CastCustomSpell(GetTarget(), 72373, nullptr, &dmg, nullptr, true);
}
}

20
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
View File

@@ -864,7 +864,7 @@ public:
void JustDied(Unit* /*who*/) override
{
me->CastSpell((Unit*)NULL, SPELL_HALLUCINATION_2, false);
me->CastSpell((Unit*)nullptr, SPELL_HALLUCINATION_2, false);
}
void UpdateAI(uint32 diff) override
@@ -1131,7 +1131,7 @@ public:
events.ScheduleEvent(EVENT_CURSED_ARROW, 10000);
break;
case EVENT_FROST_TRAP:
me->CastSpell((Unit*)NULL, SPELL_FROST_TRAP, false);
me->CastSpell((Unit*)nullptr, SPELL_FROST_TRAP, false);
events.ScheduleEvent(EVENT_FROST_TRAP, 30000);
break;
case EVENT_ICE_SHOT:
@@ -1201,7 +1201,7 @@ public:
switch (events.ExecuteEvent())
{
case EVENT_ACTIVATE_REFLECTIONS:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_REFLECTIONS_DUMMY, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_REFLECTIONS_DUMMY, false);
pInstance->SetData(ACTION_SPIRITUAL_REFLECTIONS_ACTIVATE, 1);
break;
case EVENT_THROW_SHIELD:
@@ -1280,7 +1280,7 @@ public:
void JustDied(Unit* /*killer*/) override
{
me->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, false);
me->CastSpell((Unit*)nullptr, SPELL_SPIRIT_BURST, false);
}
void EnterEvadeMode() override
@@ -1511,7 +1511,7 @@ public:
leader->CastSpell(leader, SPELL_HOR_SUICIDE, true);
Unit::Kill(me, leader);
me->InterruptNonMeleeSpells(true);
me->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE, false);
me->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE, false);
}
break;
case EVENT_LK_START_FOLLOWING:
@@ -1581,13 +1581,13 @@ public:
DoAction(ACTION_CHECK_TRASH_DIED);
break;
case EVENT_LK_SUMMON_GHOULS:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_RAGING_GHOULS, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_RAGING_GHOULS, false);
break;
case EVENT_LK_SUMMON_RWD:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_RISEN_WITCH_DOCTOR, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_RISEN_WITCH_DOCTOR, false);
break;
case EVENT_LK_SUMMON_LA:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_LUMBERING_ABOMINATION, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_LUMBERING_ABOMINATION, false);
break;
case EVENT_LK_SUMMON_NEXT_ICE_WALL:
Talk(SAY_LK_IW_1 + currentWall);
@@ -1776,7 +1776,7 @@ public:
textId += 10;
Talk(textId);
if (currentStopPoint <= 4)
me->CastSpell((Unit*)NULL, (me->GetEntry() == NPC_JAINA_PART2 ? SPELL_DESTROY_WALL_JAINA : SPELL_DESTROY_WALL_SYLVANAS), false);
me->CastSpell((Unit*)nullptr, (me->GetEntry() == NPC_JAINA_PART2 ? SPELL_DESTROY_WALL_JAINA : SPELL_DESTROY_WALL_SYLVANAS), false);
else
{
me->SetFacingTo(PathWaypoints[PATH_WP_COUNT - 1].GetOrientation());
@@ -1990,7 +1990,7 @@ public:
PreventDefaultAction();
if (Unit* caster = GetCaster())
if (Creature* c = caster->SummonCreature(WORLD_TRIGGER, CannonFirePos[caster->GetEntry() == NPC_JAINA_PART2 ? 0 : 1][urand(0, 2)], TEMPSUMMON_TIMED_DESPAWN, 1))
c->CastSpell((Unit*)NULL, 70021, true);
c->CastSpell((Unit*)nullptr, 70021, true);
}
void Register() override

4
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
View File

@@ -27,7 +27,7 @@ public:
_owner.AI()->Talk(SAY_BATTERED_HILT_HALT);
break;
case 3:
_owner.CastSpell((Unit*)NULL, 69966, true);
_owner.CastSpell((Unit*)nullptr, 69966, true);
_owner.AI()->Talk(SAY_BATTERED_HILT_REALIZE);
if (InstanceScript* instance = _owner.GetInstanceScript())
instance->SetData(DATA_BATTERED_HILT, 4);
@@ -76,7 +76,7 @@ public:
_owner.m_Events.AddEvent(new UtherBatteredHiltEvent(_owner, _eventId + 1), _owner.m_Events.CalculateTime(5000));
break;
case 13:
_owner.CastSpell((Unit*)NULL, 73036, true);
_owner.CastSpell((Unit*)nullptr, 73036, true);
_owner.m_Events.AddEvent(new UtherBatteredHiltEvent(_owner, _eventId + 1), _owner.m_Events.CalculateTime(3000));
break;
case 14:

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
View File

@@ -232,7 +232,7 @@ public:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 140.0f, true))
{
WorldPacket data;
ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, NULL, EMOTE_THROW_SARONITE);
ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, EMOTE_THROW_SARONITE);
target->ToPlayer()->GetSession()->SendPacket(&data);
me->CastSpell(target, SPELL_THROW_SARONITE, false);
}

4
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
View File

@@ -108,7 +108,7 @@ public:
{
WorldPacket data;
ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, NULL, EMOTE_ICK_CHASING);
ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, EMOTE_ICK_CHASING);
target->ToPlayer()->GetSession()->SendPacket(&data);
AttackStart(target);
@@ -122,7 +122,7 @@ public:
if (Vehicle* v = me->GetVehicleKit())
if (Unit* p = v->GetPassenger(0))
return p->ToCreature();
return (Creature*)NULL;
return (Creature*)nullptr;
}
void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask) override