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

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
View File

@@ -125,7 +125,7 @@ public:
AddWaypoint(13, 1281.2f, -26.8f, 33.5f, 0);
AddWaypoint(14, 1262, -26.9f, 33.5f, 0);
Start(true, false, 0, NULL, false, true);
Start(true, false, 0, nullptr, false, true);
}
InstanceScript* m_pInstance;

4
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
View File

@@ -136,7 +136,7 @@ public:
}
case EVENT_SHATTER:
{
me->CastSpell((Unit*)NULL, DUNGEON_MODE(SHATTER, SHATTER_H), false);
me->CastSpell((Unit*)nullptr, DUNGEON_MODE(SHATTER, SHATTER_H), false);
Talk(SAY_SHATTER);
events.RescheduleEvent(EVENT_REMOVE_STONED, 1500);
break;
@@ -179,7 +179,7 @@ public:
if (Unit* target = GetHitUnit())
{
target->RemoveAurasDueToSpell(GROUND_SLAM_STONED_EFFECT);
target->CastSpell((Unit*)NULL, SPELL_SHATTER_EFFECT, true);
target->CastSpell((Unit*)nullptr, SPELL_SHATTER_EFFECT, true);
}
}

28
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
View File

@@ -523,9 +523,9 @@ public:
me->CastSpell(summon, SPELL_REORIGINATION, true);
break;
case NPC_BLACK_HOLE:
summon->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_TRIGGER, true);
summon->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_TRIGGER, true);
summon->CastSpell(summon, SPELL_CONSTELLATION_PHASE_TRIGGER, true);
summon->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_EXPLOSION, false);
summon->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_EXPLOSION, false);
summon->CastSpell(summon, SPELL_SUMMON_VOID_ZONE_VISUAL, true);
break;
case NPC_ALGALON_VOID_ZONE_VISUAL_STALKER:
@@ -612,7 +612,7 @@ public:
Talk(SAY_ALGALON_INTRO_1);
break;
case EVENT_INTRO_2:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_AZEROTH, true);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_AZEROTH, true);
Talk(SAY_ALGALON_INTRO_2);
break;
case EVENT_INTRO_3:
@@ -634,7 +634,7 @@ public:
break;
case EVENT_INTRO_TIMER_DONE:
events.SetPhase(PHASE_NORMAL);
me->CastSpell((Unit*)NULL, SPELL_SUPERMASSIVE_FAIL, true);
me->CastSpell((Unit*)nullptr, SPELL_SUPERMASSIVE_FAIL, true);
// Hack: _IsValidTarget failed earlier due to flags, call AttackStart again
me->SetReactState(REACT_AGGRESSIVE);
me->setFaction(14);
@@ -662,7 +662,7 @@ public:
break;
case EVENT_COSMIC_SMASH:
Talk(EMOTE_ALGALON_COSMIC_SMASH);
me->CastCustomSpell(SPELL_COSMIC_SMASH, SPELLVALUE_MAX_TARGETS, RAID_MODE(1, 3), (Unit*)NULL);
me->CastCustomSpell(SPELL_COSMIC_SMASH, SPELLVALUE_MAX_TARGETS, RAID_MODE(1, 3), (Unit*)nullptr);
events.RepeatEvent(25500);
break;
case EVENT_ACTIVATE_LIVING_CONSTELLATION:
@@ -685,13 +685,13 @@ public:
EntryCheckPredicate pred(NPC_LIVING_CONSTELLATION);
summons.DoAction(ACTION_BIG_BANG, pred);
me->CastSpell((Unit*)NULL, SPELL_BIG_BANG, false);
me->CastSpell((Unit*)nullptr, SPELL_BIG_BANG, false);
events.RepeatEvent(90500);
break;
}
case EVENT_ASCEND_TO_THE_HEAVENS:
Talk(SAY_ALGALON_ASCEND);
me->CastSpell((Unit*)NULL, SPELL_ASCEND_TO_THE_HEAVENS, false);
me->CastSpell((Unit*)nullptr, SPELL_ASCEND_TO_THE_HEAVENS, false);
events.ScheduleEvent(EVENT_EVADE, 2500);
break;
case EVENT_EVADE:
@@ -714,13 +714,13 @@ public:
me->GetMotionMaster()->MovePoint(POINT_ALGALON_OUTRO, AlgalonOutroPos);
break;
case EVENT_OUTRO_3:
me->CastSpell((Unit*)NULL, SPELL_KILL_CREDIT);
me->CastSpell((Unit*)nullptr, SPELL_KILL_CREDIT);
// Summon Chest
if (GameObject* go = me->SummonGameObject(RAID_MODE(GO_ALGALON_CHEST, GO_ALGALON_CHEST_HERO), 1632.1f, -306.561f, 417.321f, 4.69494f, 0, 0, 0, 1, 0))
go->SetUInt32Value(GAMEOBJECT_FLAGS, 0);
break;
case EVENT_OUTRO_4:
me->CastSpell((Unit*)NULL, SPELL_SUPERMASSIVE_FAIL);
me->CastSpell((Unit*)nullptr, SPELL_SUPERMASSIVE_FAIL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
break;
case EVENT_OUTRO_5:
@@ -758,7 +758,7 @@ public:
Talk(SAY_ALGALON_DESPAWN_3);
break;
case EVENT_DESPAWN_ALGALON_4:
me->CastSpell((Unit*)NULL, SPELL_ASCEND_TO_THE_HEAVENS, false);
me->CastSpell((Unit*)nullptr, SPELL_ASCEND_TO_THE_HEAVENS, false);
break;
case EVENT_DESPAWN_ALGALON_5:
me->SetStandState(UNIT_STAND_STATE_STAND);
@@ -974,7 +974,7 @@ public:
if (InstanceScript* instance = me->GetInstanceScript())
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_ID_SUPERMASSIVE_START);
caster->CastSpell((Unit*)NULL, SPELL_BLACK_HOLE_CREDIT, TRIGGERED_FULL_MASK);
caster->CastSpell((Unit*)nullptr, SPELL_BLACK_HOLE_CREDIT, TRIGGERED_FULL_MASK);
caster->ToCreature()->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1);
if (Creature* voidZone = caster->FindNearestCreature(NPC_ALGALON_VOID_ZONE_VISUAL_STALKER, 10.0f))
@@ -990,7 +990,7 @@ public:
switch (events.ExecuteEvent())
{
case EVENT_ARCANE_BARRAGE:
me->CastCustomSpell(SPELL_ARCANE_BARRAGE, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, true);
me->CastCustomSpell(SPELL_ARCANE_BARRAGE, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, true);
events.RepeatEvent(2500);
break;
case EVENT_RESUME_UPDATING:
@@ -1031,7 +1031,7 @@ public:
_summonTimer += diff;
if (_summonTimer >= 30000)
{
me->CastSpell((Unit*)NULL, SPELL_SUMMON_UNLEASHED_DARK_MATTER, true);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_UNLEASHED_DARK_MATTER, true);
_summonTimer = 0;
}
}
@@ -1173,7 +1173,7 @@ public:
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
Unit::DealDamage(GetTarget(), GetTarget(), GetTarget()->CountPctFromMaxHealth(1), NULL, NODAMAGE);
Unit::DealDamage(GetTarget(), GetTarget(), GetTarget()->CountPctFromMaxHealth(1), nullptr, NODAMAGE);
}
void Register() override

6
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
View File

@@ -430,7 +430,7 @@ public:
(*itr)->m_positionZ = prevZ;
}
me->CastSpell((Unit*)NULL, SPELL_FLASH_FREEZE_CAST, false);
me->CastSpell((Unit*)nullptr, SPELL_FLASH_FREEZE_CAST, false);
me->MonsterTextEmote("Hodir begins to cast Flash Freeze!", 0, true);
me->MonsterYell(TEXT_HODIR_FLASH_FREEZE, LANG_UNIVERSAL, 0);
me->PlayDirectSound(SOUND_HODIR_FLASH_FREEZE, 0);
@@ -803,7 +803,7 @@ public:
}
break;
case EVENT_PRIEST_DISPELL_MAGIC:
me->CastCustomSpell(SPELL_PRIEST_DISPELL_MAGIC, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false);
me->CastCustomSpell(SPELL_PRIEST_DISPELL_MAGIC, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false);
events.RepeatEvent(7000);
break;
case EVENT_PRIEST_GREAT_HEAL:
@@ -1415,7 +1415,7 @@ public:
{
PreventDefaultAction();
if (Unit* target = GetTarget())
target->CastSpell((Unit*)NULL, (GetId() == SPELL_SHAMAN_STORM_CLOUD_10 ? SPELL_SHAMAN_STORM_POWER_10 : SPELL_SHAMAN_STORM_POWER_25), true);
target->CastSpell((Unit*)nullptr, (GetId() == SPELL_SHAMAN_STORM_CLOUD_10 ? SPELL_SHAMAN_STORM_POWER_10 : SPELL_SHAMAN_STORM_POWER_25), true);
}
void Register() override

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
View File

@@ -343,7 +343,7 @@ public:
case 0:
break;
case EVENT_ACTIVATE_CONSTRUCT:
me->CastCustomSpell(SPELL_ACTIVATE_CONSTRUCT, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false);
me->CastCustomSpell(SPELL_ACTIVATE_CONSTRUCT, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false);
if (++counter >= 20)
{
me->MonsterYell(TEXT_BERSERK, LANG_UNIVERSAL, 0);

10
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
View File

@@ -1525,7 +1525,7 @@ public:
events.RepeatEvent(10000);
break;
case EVENT_FROST_BOMB:
me->CastCustomSpell(SPELL_VX001_FROST_BOMB, SPELLVALUE_MAX_TARGETS, 1, (Unit*)NULL, false);
me->CastCustomSpell(SPELL_VX001_FROST_BOMB, SPELLVALUE_MAX_TARGETS, 1, (Unit*)nullptr, false);
events.RepeatEvent(45000);
break;
}
@@ -2167,7 +2167,7 @@ public:
if (Unit* c = GetCaster())
{
uint32 id = ( c->GetMap()->Is25ManRaid() ? ((aurEff->GetTickNumber() % 2) ? SPELL_RAPID_BURST_DAMAGE_25_2 : SPELL_RAPID_BURST_DAMAGE_25_1) : ((aurEff->GetTickNumber() % 2) ? SPELL_RAPID_BURST_DAMAGE_10_2 : SPELL_RAPID_BURST_DAMAGE_10_1) );
c->CastSpell((Unit*)NULL, id, true);
c->CastSpell((Unit*)nullptr, id, true);
}
}
@@ -2219,8 +2219,8 @@ public:
lastOrientation = new_o;
c->SetOrientation(new_o);
c->SetFacingTo(new_o);
c->CastSpell((Unit*)NULL, 63297, true);
c->CastSpell((Unit*)NULL, 64042, true);
c->CastSpell((Unit*)nullptr, 63297, true);
c->CastSpell((Unit*)nullptr, 64042, true);
}
}
@@ -2473,7 +2473,7 @@ public:
}
break;
case EVENT_EMERGENCY_BOT_ATTACK:
me->CastSpell((Unit*)NULL, SPELL_WATER_SPRAY, false);
me->CastSpell((Unit*)nullptr, SPELL_WATER_SPRAY, false);
events.RescheduleEvent(EVENT_EMERGENCY_BOT_CHECK, 5000);
break;
}

18
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
View File

@@ -659,7 +659,7 @@ public:
// Illusion shatters (param - stun time)
WorldPacket data;
ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, NULL, "Illusion shatters and a path to the central chamber opens!");
ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, "Illusion shatters and a path to the central chamber opens!");
me->SendMessageToSetInRange(&data, 500, false);
uint32 timer = events.GetNextEventTime(EVENT_SARA_P2_OPEN_PORTALS);
@@ -986,7 +986,7 @@ public:
void JustDied(Unit*) override
{
me->CastSpell((Unit*)NULL, SPELL_SHADOW_NOVA, true);
me->CastSpell((Unit*)nullptr, SPELL_SHADOW_NOVA, true);
}
void UpdateAI(uint32 diff) override
@@ -1904,12 +1904,12 @@ public:
WorldPacket data;
if (creature->GetGUID() != _yoggGUID)
{
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text);
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text);
creature->SendMessageToSetInRange(&data, 90, true);
}
else if (Creature* cr = me->SummonTrigger(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 5, 0, 5000))
{
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text);
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text);
cr->SendMessageToSetInRange(&data, 90, true);
}
else
@@ -2018,12 +2018,12 @@ public:
WorldPacket data;
if (creature->GetGUID() != _yoggGUID)
{
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text);
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text);
creature->SendMessageToSetInRange(&data, 90, true);
}
else if (Creature* cr = me->SummonTrigger(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 5, 0, 5000))
{
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text);
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text);
cr->SendMessageToSetInRange(&data, 90, true);
}
else
@@ -2138,12 +2138,12 @@ public:
WorldPacket data;
if (creature->GetGUID() != _yoggGUID)
{
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text);
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text);
creature->SendMessageToSetInRange(&data, 90, true);
}
else if (Creature* cr = me->SummonTrigger(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 5, 0, 5000))
{
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, NULL, text);
ChatHandler::BuildChatPacket(data, yell ? CHAT_MSG_MONSTER_YELL : CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, creature, nullptr, text);
cr->SendMessageToSetInRange(&data, 90, true);
}
else
@@ -2893,7 +2893,7 @@ public:
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
int32 damage = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), 60);
GetTarget()->CastCustomSpell(SPELL_GRIM_REPRISAL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetDamageInfo()->GetAttacker(), true, NULL, aurEff);
GetTarget()->CastCustomSpell(SPELL_GRIM_REPRISAL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetDamageInfo()->GetAttacker(), true, nullptr, aurEff);
}
void Register() override

2
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View File

@@ -609,7 +609,7 @@ public:
case TYPE_THORIM:
case TYPE_FREYA:
m_auiEncounter[type] = data;
ShowKeeperGossip(type, NULL, m_keepersGossipGUID[type - TYPE_FREYA]);
ShowKeeperGossip(type, nullptr, m_keepersGossipGUID[type - TYPE_FREYA]);
if (GetData(TYPE_MIMIRON) == DONE && GetData(TYPE_FREYA) == DONE && GetData(TYPE_HODIR) == DONE && GetData(TYPE_THORIM) == DONE)
{
if (GameObject* go = instance->GetGameObject(m_keepersgateGUID))