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

@@ -992,7 +992,7 @@ public:
next->SetHealth(current->GetHealth());
current->AI()->DoAction(ACTION_REMOVE_INVOCATION);
current->SetHealth(1);
current->CastSpell((Unit*)NULL, visualSpellId, true);
current->CastSpell((Unit*)nullptr, visualSpellId, true);
next->AI()->Talk(1);
}
events.ScheduleEvent(EVENT_INVOCATION_OF_BLOOD, 46000);
@@ -1437,7 +1437,7 @@ public:
{
if (GetTarget()->GetTypeId() == TYPEID_PLAYER && GetTarget()->isMoving())
{
GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, NULL, aurEff);
GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, nullptr, aurEff);
}
}

6
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
View File

@@ -337,7 +337,7 @@ public:
if (target)
{
me->CastSpell(target, SPELL_VAMPIRIC_BITE, false);
me->CastSpell((Unit*)NULL, SPELL_VAMPIRIC_BITE_DUMMY, true);
me->CastSpell((Unit*)nullptr, SPELL_VAMPIRIC_BITE_DUMMY, true);
Talk(SAY_VAMPIRIC_BITE);
SetGUID(target->GetGUID(), GUID_VAMPIRE);
target->CastSpell(target, SPELL_PRESENCE_OF_THE_DARKFALLEN_DUMMY, TRIGGERED_FULL_MASK);
@@ -817,7 +817,7 @@ public:
{
PreventDefaultAction();
int32 heal = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), aurEff->GetAmount());
GetTarget()->CastCustomSpell(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), TRIGGERED_FULL_MASK, NULL, aurEff);
GetTarget()->CastCustomSpell(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), TRIGGERED_FULL_MASK, nullptr, aurEff);
}
void Register() override
@@ -957,7 +957,7 @@ public:
return;
if (InstanceScript* instance = GetHitUnit()->GetInstanceScript())
GetHitUnit()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_BLOOD_QUEEN_LANA_THEL));
GetHitUnit()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_BLOOD_QUEEN_LANA_THEL));
}
void Register() override

4
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
View File

@@ -423,7 +423,7 @@ public:
break;
case EVENT_BLOOD_NOVA:
{
me->CastSpell((Unit*)NULL, SPELL_BLOOD_NOVA_TRIGGER, false);
me->CastSpell((Unit*)nullptr, SPELL_BLOOD_NOVA_TRIGGER, false);
events.ScheduleEvent(EVENT_BLOOD_NOVA, urand(20000, 25000));
break;
}
@@ -432,7 +432,7 @@ public:
events.ScheduleEvent(EVENT_RUNE_OF_BLOOD, urand(20000, 25000));
break;
case EVENT_BOILING_BLOOD:
me->CastSpell((Unit*)NULL, SPELL_BOILING_BLOOD, false);
me->CastSpell((Unit*)nullptr, SPELL_BOILING_BLOOD, false);
events.ScheduleEvent(EVENT_BOILING_BLOOD, urand(15000, 20000));
break;
case EVENT_BERSERK:

16
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
View File

@@ -1445,7 +1445,7 @@ void TriggerBurningPitch(Creature* c)
uint32 spellId = i->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_BURNING_PITCH_A : SPELL_BURNING_PITCH_H;
if (!c->HasSpellCooldown(spellId))
{
c->CastSpell((Unit*)NULL, spellId, false);
c->CastSpell((Unit*)nullptr, spellId, false);
c->_AddCreatureSpellCooldown(spellId, urand(3000, 4000));
}
}
@@ -1763,11 +1763,11 @@ public:
me->SetInCombatWithZone();
me->AddThreat(player, 1.0f);
}
me->CastSpell((Unit*)NULL, SPELL_BELOW_ZERO, false);
me->CastSpell((Unit*)nullptr, SPELL_BELOW_ZERO, false);
break;
case SLOT_MAGE_1:
case SLOT_MAGE_2:
me->CastSpell((Unit*)NULL, SPELL_SHADOW_CHANNELING, false);
me->CastSpell((Unit*)nullptr, SPELL_SHADOW_CHANNELING, false);
break;
default:
break;
@@ -1911,7 +1911,7 @@ public:
if (me->HasSpellCooldown(spellId))
return;
me->CastSpell((Unit*)NULL, spellId, true);
me->CastSpell((Unit*)nullptr, spellId, true);
me->_AddCreatureSpellCooldown(spellId, 9000);
}
@@ -1954,8 +1954,8 @@ public:
void HandleRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
SpellInfo const* damageInfo = sSpellMgr->GetSpellInfo(SPELL_ROCKET_PACK_DAMAGE);
GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude()), NULL, true);
GetTarget()->CastSpell((Unit*)NULL, SPELL_ROCKET_BURST, true);
GetTarget()->CastCustomSpell(SPELL_ROCKET_PACK_DAMAGE, SPELLVALUE_BASE_POINT0, 2 * (damageInfo->Effects[EFFECT_0].CalcValue() + aurEff->GetTickNumber() * aurEff->GetAmplitude()), nullptr, true);
GetTarget()->CastSpell((Unit*)nullptr, SPELL_ROCKET_BURST, true);
}
void Register() override
@@ -2509,7 +2509,7 @@ public:
void HandleDummy(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
GetCaster()->CastCustomSpell(uint32(GetEffectValue()), SPELLVALUE_BASE_POINT0, 8000, NULL, TRIGGERED_FULL_MASK);
GetCaster()->CastCustomSpell(uint32(GetEffectValue()), SPELLVALUE_BASE_POINT0, 8000, nullptr, TRIGGERED_FULL_MASK);
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BURNING_PITCH, TRIGGERED_FULL_MASK);
}
@@ -2597,7 +2597,7 @@ public:
void DamageGunship(SpellEffIndex /*effIndex*/)
{
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
GetCaster()->CastCustomSpell(instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_BURNING_PITCH_DAMAGE_A : SPELL_BURNING_PITCH_DAMAGE_H, SPELLVALUE_BASE_POINT0, 5000, NULL, TRIGGERED_FULL_MASK);
GetCaster()->CastCustomSpell(instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_BURNING_PITCH_DAMAGE_A : SPELL_BURNING_PITCH_DAMAGE_H, SPELLVALUE_BASE_POINT0, 5000, nullptr, TRIGGERED_FULL_MASK);
}
void Register() override

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View File

@@ -170,7 +170,7 @@ public:
break;
case EVENT_SPELL_COLDFLAME:
if (!me->HasAura(SPELL_BONE_STORM))
me->CastSpell((Unit*)NULL, SPELL_COLDFLAME_NORMAL, false);
me->CastSpell((Unit*)nullptr, SPELL_COLDFLAME_NORMAL, false);
events.RepeatEvent(5000);
break;
case EVENT_SPELL_COLDFLAME_BONE_STORM:

4
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -335,7 +335,7 @@ public:
if (Is25ManRaid() && me->HasAura(SPELL_SHADOWS_FATE))
DoCastAOE(SPELL_UNHOLY_INFUSION_CREDIT, true); // ReqTargetAura in dbc
me->CastSpell((Unit*)NULL, SPELL_MUTATED_PLAGUE_CLEAR, true);
me->CastSpell((Unit*)nullptr, SPELL_MUTATED_PLAGUE_CLEAR, true);
}
void JustSummoned(Creature* summon) override
@@ -1204,7 +1204,7 @@ public:
int32 damage = spell->Effects[EFFECT_0].CalcValue(caster);
damage = damage * pow(2.5f, GetStackAmount());
GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true, NULL, aurEff, GetCasterGUID());
GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true, nullptr, aurEff, GetCasterGUID());
}
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)

6
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
View File

@@ -233,7 +233,7 @@ public:
{
uint32 index = getOozeFloodSpellIndex(spell->Id);
if (target->GetGUID() == _oozeFloodDummyGUIDs[index][0] || target->GetGUID() == _oozeFloodDummyGUIDs[index][1])
target->CastSpell((Unit*)NULL, spell->Effects[0].CalcValue(), false);
target->CastSpell((Unit*)nullptr, spell->Effects[0].CalcValue(), false);
}
break;
}
@@ -281,14 +281,14 @@ public:
}
break;
case EVENT_MUTATED_INFECTION:
me->CastCustomSpell(SPELL_MUTATED_INFECTION, SPELLVALUE_MAX_TARGETS, 1, NULL, false);
me->CastCustomSpell(SPELL_MUTATED_INFECTION, SPELLVALUE_MAX_TARGETS, 1, nullptr, false);
events.ScheduleEvent(EVENT_MUTATED_INFECTION, infectionCooldown);
break;
case EVENT_ROTFACE_OOZE_FLOOD:
if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
{
professor->AI()->Talk(SAY_ROTFACE_OOZE_FLOOD);
me->CastSpell((Unit*)NULL, oozeFloodSpells[_oozeFloodStage], true);
me->CastSpell((Unit*)nullptr, oozeFloodSpells[_oozeFloodStage], true);
if (++_oozeFloodStage == 4)
_oozeFloodStage = 0;
}

8
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -178,7 +178,7 @@ public:
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
_owner->CastSpell((Unit*)NULL, SPELL_FROST_BOMB, false, nullptr, nullptr, _sindragosaGUID);
_owner->CastSpell((Unit*)nullptr, SPELL_FROST_BOMB, false, nullptr, nullptr, _sindragosaGUID);
_owner->RemoveAurasDueToSpell(SPELL_FROST_BOMB_VISUAL);
return true;
}
@@ -560,11 +560,11 @@ public:
break;
case EVENT_UNCHAINED_MAGIC:
Talk(SAY_UNCHAINED_MAGIC);
me->CastSpell((Unit*)NULL, SPELL_UNCHAINED_MAGIC, false);
me->CastSpell((Unit*)nullptr, SPELL_UNCHAINED_MAGIC, false);
events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(30000, 35000), EVENT_GROUP_LAND_PHASE);
break;
case EVENT_ICY_GRIP:
me->CastSpell((Unit*)NULL, SPELL_ICY_GRIP, false);
me->CastSpell((Unit*)nullptr, SPELL_ICY_GRIP, false);
events.DelayEventsToMax(1001, 0);
events.ScheduleEvent(EVENT_BLISTERING_COLD, 1000, EVENT_GROUP_LAND_PHASE);
if (uint32 evTime = events.GetNextEventTime(EVENT_ICE_TOMB))
@@ -1020,7 +1020,7 @@ public:
void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID());
GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff, GetCasterGUID());
}
void Register() override

98
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View File

@@ -452,7 +452,7 @@ public:
switch (go->GetEntry())
{
case GO_ARTHAS_PLATFORM:
go->SetDestructibleState(GO_DESTRUCTIBLE_INTACT, NULL, true);
go->SetDestructibleState(GO_DESTRUCTIBLE_INTACT, nullptr, true);
break;
case GO_DOODAD_ICECROWN_THRONEFROSTYWIND01:
go->SetGoState(GO_STATE_ACTIVE);
@@ -509,7 +509,7 @@ public:
{
_owner->SetReactState(REACT_AGGRESSIVE);
_owner->CastSpell(_owner, SPELL_VILE_SPIRIT_MOVE_SEARCH, true);
_owner->CastSpell((Unit*)NULL, SPELL_VILE_SPIRIT_DAMAGE_SEARCH, true);
_owner->CastSpell((Unit*)nullptr, SPELL_VILE_SPIRIT_DAMAGE_SEARCH, true);
return true;
}
@@ -527,7 +527,7 @@ public:
bool Execute(uint64 /*time*/, uint32 /*diff*/) override
{
_owner->CastCustomSpell(SPELL_TRIGGER_VILE_SPIRIT_HEROIC, SPELLVALUE_MAX_TARGETS, 1, NULL, true);
_owner->CastCustomSpell(SPELL_TRIGGER_VILE_SPIRIT_HEROIC, SPELLVALUE_MAX_TARGETS, 1, nullptr, true);
if (--_counter)
{
@@ -566,7 +566,7 @@ public:
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
_owner.CastSpell((Unit*)NULL, SPELL_PLAY_MOVIE, false);
_owner.CastSpell((Unit*)nullptr, SPELL_PLAY_MOVIE, false);
return true;
}
@@ -726,8 +726,8 @@ public:
events.ScheduleEvent(EVENT_START_ATTACK, 5250);
break;
case ACTION_BREAK_FROSTMOURNE:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE, true);
me->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE_2, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE, true);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE_2, false);
SetEquipmentSlots(false, EQUIP_BROKEN_FROSTMOURNE);
if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING)))
tirion->AI()->DoAction(ACTION_BREAK_FROSTMOURNE);
@@ -788,7 +788,7 @@ public:
me->AttackStop();
me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_FURY_OF_FROSTMOURNE);
me->InterruptNonMeleeSpells(true);
me->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE, false);
me->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE, false);
me->SetWalk(true);
if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING)))
@@ -1008,7 +1008,7 @@ public:
me->InterruptNonMeleeSpells(false);
me->ClearUnitState(UNIT_STATE_CASTING);
me->SetFacingTo(0.0f);
me->CastSpell((Unit*)NULL, SPELL_QUAKE, false);
me->CastSpell((Unit*)nullptr, SPELL_QUAKE, false);
me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL);
Talk(SAY_LK_QUAKE);
break;
@@ -1023,7 +1023,7 @@ public:
me->InterruptNonMeleeSpells(false);
me->ClearUnitState(UNIT_STATE_CASTING);
me->SetFacingTo(0.0f);
me->CastSpell((Unit*)NULL, SPELL_QUAKE, false);
me->CastSpell((Unit*)nullptr, SPELL_QUAKE, false);
me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL);
Talk(SAY_LK_QUAKE);
break;
@@ -1067,7 +1067,7 @@ public:
events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, (IsHeroic() ? urand(1250, 1750) : urand(1750, 2250)), EVENT_GROUP_ABILITIES);
break;
case EVENT_SUMMON_ICE_SPHERE:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_ICE_SPHERE, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_ICE_SPHERE, false);
events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 7500, EVENT_GROUP_ABILITIES);
break;
case EVENT_SUMMON_RAGING_SPIRIT:
@@ -1124,7 +1124,7 @@ public:
{
me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL);
Talk(SAY_LK_SUMMON_VALKYR);
me->CastSpell((Unit*)NULL, SUMMON_VALKYR, false);
me->CastSpell((Unit*)nullptr, SUMMON_VALKYR, false);
events.ScheduleEvent(EVENT_SUMMON_VALKYR, 45000, EVENT_GROUP_ABILITIES);
// schedule a defile (or reschedule it) if next defile event
@@ -1139,7 +1139,7 @@ public:
break;
case EVENT_VILE_SPIRITS:
me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_SPECIAL);
me->CastSpell((Unit*)NULL, SPELL_VILE_SPIRITS, false);
me->CastSpell((Unit*)nullptr, SPELL_VILE_SPIRITS, false);
events.ScheduleEvent(EVENT_VILE_SPIRITS, 30000, EVENT_GROUP_VILE_SPIRITS);
break;
case EVENT_HARVEST_SOUL:
@@ -1154,7 +1154,7 @@ public:
break;
case EVENT_HARVEST_SOULS:
Talk(SAY_LK_HARVEST_SOUL);
me->CastSpell((Unit*)NULL, SPELL_HARVEST_SOULS, false);
me->CastSpell((Unit*)nullptr, SPELL_HARVEST_SOULS, false);
_phase = PHASE_FROSTMOURNE;
me->SetReactState(REACT_PASSIVE);
me->AttackStop();
@@ -1188,7 +1188,7 @@ public:
break;
case EVENT_FROSTMOURNE_HEROIC:
_bFrostmournePhase = true;
if (TempSummon* terenas = me->GetMap()->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE_H, TerenasSpawnHeroic, NULL, 55000))
if (TempSummon* terenas = me->GetMap()->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE_H, TerenasSpawnHeroic, nullptr, 55000))
{
terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO);
if (Creature* spawner = terenas->FindNearestCreature(NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f, true))
@@ -1246,7 +1246,7 @@ public:
EntryCheckPredicate pred(NPC_STRANGULATE_VEHICLE);
summons.DoAction(ACTION_TELEPORT_BACK, pred);
instance->SetBossState(DATA_THE_LICH_KING, FAIL);
me->CastSpell((Unit*)NULL, SPELL_KILL_FROSTMOURNE_PLAYERS, true);
me->CastSpell((Unit*)nullptr, SPELL_KILL_FROSTMOURNE_PLAYERS, true);
BossAI::EnterEvadeMode();
me->SetReactState(REACT_AGGRESSIVE);
@@ -1414,7 +1414,7 @@ public:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
theLichKing->AI()->Talk(SAY_LK_INTRO_3);
theLichKing->CastSpell((Unit*)NULL, SPELL_ICE_LOCK, false);
theLichKing->CastSpell((Unit*)nullptr, SPELL_ICE_LOCK, false);
_events.ScheduleEvent(EVENT_INTRO_FINISH, 1000);
}
break;
@@ -1455,7 +1455,7 @@ public:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
theLichKing->AI()->Talk(SAY_LK_OUTRO_1);
theLichKing->CastSpell((Unit*)NULL, SPELL_FURY_OF_FROSTMOURNE_NO_REZ, true);
theLichKing->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE_NO_REZ, true);
Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
if (Player* p = itr->GetSource())
@@ -1467,7 +1467,7 @@ public:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
theLichKing->AI()->Talk(SAY_LK_OUTRO_2);
theLichKing->CastSpell((Unit*)NULL, SPELL_EMOTE_QUESTION_NO_SHEATH, false);
theLichKing->CastSpell((Unit*)nullptr, SPELL_EMOTE_QUESTION_NO_SHEATH, false);
}
break;
case EVENT_OUTRO_LK_EMOTE_TALK:
@@ -1502,7 +1502,7 @@ public:
case EVENT_OUTRO_LK_RAISE_DEAD:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
theLichKing->CastSpell((Unit*)NULL, SPELL_RAISE_DEAD, false);
theLichKing->CastSpell((Unit*)nullptr, SPELL_RAISE_DEAD, false);
theLichKing->ClearUnitState(UNIT_STATE_CASTING);
me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_FINAL);
}
@@ -1523,7 +1523,7 @@ public:
theLichKing->AI()->Talk(SAY_LK_OUTRO_6);
me->SetFacingToObject(theLichKing);
theLichKing->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, EQUIP_UNEQUIP);
theLichKing->CastSpell((Unit*)NULL, SPELL_SUMMON_BROKEN_FROSTMOURNE_3, true);
theLichKing->CastSpell((Unit*)nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE_3, true);
me->GetMap()->SetZoneOverrideLight(AREA_THE_FROZEN_THRONE, LIGHT_SOULSTORM, 10000);
me->GetMap()->SetZoneWeather(AREA_THE_FROZEN_THRONE, WEATHER_STATE_BLACKSNOW, 0.5f);
@@ -1534,16 +1534,16 @@ public:
break;
case EVENT_OUTRO_AFTER_SUMMON_BROKEN_FROSTMOURNE:
if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f))
frostmourne->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE, true);
frostmourne->CastSpell((Unit*)nullptr, SPELL_BROKEN_FROSTMOURNE, true);
break;
case EVENT_OUTRO_KNOCK_BACK:
if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f))
frostmourne->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE_KNOCK, false);
frostmourne->CastSpell((Unit*)nullptr, SPELL_BROKEN_FROSTMOURNE_KNOCK, false);
break;
case EVENT_OUTRO_SOUL_BARRAGE:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
theLichKing->CastSpell((Unit*)NULL, SPELL_SOUL_BARRAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS);
theLichKing->CastSpell((Unit*)nullptr, SPELL_SOUL_BARRAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS);
sCreatureTextMgr->SendSound(theLichKing, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_NEUTRAL, false);
theLichKing->SetDisableGravity(true);
theLichKing->SetByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER);
@@ -1559,7 +1559,7 @@ public:
case EVENT_OUTRO_SUMMON_TERENAS:
if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f))
{
frostmourne->CastSpell((Unit*)NULL, SPELL_SUMMON_TERENAS, false);
frostmourne->CastSpell((Unit*)nullptr, SPELL_SUMMON_TERENAS, false);
if (Creature* terenas = me->FindNearestCreature(NPC_TERENAS_MENETHIL_OUTRO, 50.0f))
terenas->SetFacingToObject(frostmourne);
}
@@ -1574,7 +1574,7 @@ public:
if (Creature* terenas = me->FindNearestCreature(NPC_TERENAS_MENETHIL_OUTRO, 50.0f))
{
terenas->AI()->Talk(SAY_TERENAS_OUTRO_2);
terenas->CastSpell((Unit*)NULL, SPELL_MASS_RESURRECTION, false);
terenas->CastSpell((Unit*)nullptr, SPELL_MASS_RESURRECTION, false);
if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
lichKing->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
@@ -1615,7 +1615,7 @@ public:
me->GetMotionMaster()->MovePoint(POINT_TIRION_OUTRO, OutroPosition1);
break;
case EVENT_OUTRO_FORDRING_JUMP:
me->CastSpell((Unit*)NULL, SPELL_JUMP, false);
me->CastSpell((Unit*)nullptr, SPELL_JUMP, false);
break;
default:
@@ -1710,7 +1710,7 @@ public:
PreventHitDefaultEffect(effIndex);
GetHitUnit()->RemoveAurasDueToSpell(SPELL_RAISE_DEAD);
GetHitUnit()->InterruptNonMeleeSpells(true);
GetHitUnit()->CastSpell((Unit*)NULL, SPELL_JUMP_2, true);
GetHitUnit()->CastSpell((Unit*)nullptr, SPELL_JUMP_2, true);
if (Creature* creature = GetHitCreature())
creature->AI()->DoAction(ACTION_BREAK_FROSTMOURNE);
}
@@ -1932,7 +1932,7 @@ public:
CustomSpellValues values;
if (dispel)
values.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1)
GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
if (Unit* caster = GetCaster())
caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true);
@@ -2039,7 +2039,7 @@ public:
CustomSpellValues values;
values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount());
GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
if (Unit* caster = GetCaster())
caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true);
}
@@ -2058,7 +2058,7 @@ public:
CustomSpellValues values;
values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount());
values.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1)
GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, nullptr, TRIGGERED_FULL_MASK, nullptr, nullptr, GetCasterGUID());
if (Unit* caster = GetCaster())
caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true);
@@ -2128,7 +2128,7 @@ public:
if (targets.empty())
return;
GetCaster()->CastSpell((Unit*)NULL, SPELL_SHADOW_TRAP_KNOCKBACK, true);
GetCaster()->CastSpell((Unit*)nullptr, SPELL_SHADOW_TRAP_KNOCKBACK, true);
if (Aura* a = GetCaster()->GetAura(SPELL_SHADOW_TRAP_AURA))
a->SetDuration(0);
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
@@ -2522,7 +2522,7 @@ public:
void GoSiphon()
{
didbelow50pct = true;
me->CastSpell((Unit*)NULL, SPELL_EJECT_ALL_PASSENGERS, false);
me->CastSpell((Unit*)nullptr, SPELL_EJECT_ALL_PASSENGERS, false);
float dist = rand_norm() * 10.0f + 5.0f;
float angle = CenterPosition.GetAngle(me);
_destPoint.Relocate(CenterPosition.GetPositionX() + dist * cos(angle), CenterPosition.GetPositionY() + dist * sin(angle), 855.0f + frand(0.0f, 4.0f), 0.0f);
@@ -2611,7 +2611,7 @@ public:
if (Vehicle* v = me->GetVehicleKit())
if (Unit* passenger = v->GetPassenger(0))
p = passenger->ToPlayer();*/
me->CastSpell((Unit*)NULL, SPELL_EJECT_ALL_PASSENGERS, false);
me->CastSpell((Unit*)nullptr, SPELL_EJECT_ALL_PASSENGERS, false);
if (IsHeroic())
GoSiphon();
@@ -2650,7 +2650,7 @@ public:
case EVENT_GRAB_PLAYER:
if (!_grabbedPlayer)
{
me->CastSpell((Unit*)NULL, SPELL_VALKYR_TARGET_SEARCH, false);
me->CastSpell((Unit*)nullptr, SPELL_VALKYR_TARGET_SEARCH, false);
_events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000);
}
break;
@@ -2929,7 +2929,7 @@ public:
void OnPeriodic(AuraEffect const* aurEff)
{
if (_is25Man || ((aurEff->GetTickNumber() - 1) % 5))
GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff, GetCasterGUID());
GetTarget()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, nullptr, aurEff, GetCasterGUID());
}
void Register() override
@@ -3045,7 +3045,7 @@ public:
c->RemoveAurasDueToSpell(SPELL_VILE_SPIRIT_DAMAGE_SEARCH);
c->GetMotionMaster()->Clear(true);
c->StopMoving();
c->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, true);
c->CastSpell((Unit*)nullptr, SPELL_SPIRIT_BURST, true);
c->DespawnOrUnsummon(3000);
c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
@@ -3081,7 +3081,7 @@ public:
{
// m_originalCaster to allow stacking from different casters, meh
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH)
GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING));
GetTarget()->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING));
}
void Register() override
@@ -3159,17 +3159,17 @@ public:
if (summoner->GetTypeId() == TYPEID_PLAYER && !summoner->ToPlayer()->IsBeingTeleported() && summoner->FindMap() == me->GetMap())
{
if (buff)
summoner->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING));
summoner->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING));
me->CastSpell(summoner, SPELL_HARVEST_SOUL_TELEPORT_BACK, false);
}
else if (buff)
me->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING));
me->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING));
summoner->RemoveAurasDueToSpell(IsHeroic() ? SPELL_HARVEST_SOULS_TELEPORT : SPELL_HARVEST_SOUL_TELEPORT);
}
else
me->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING));
me->CastSpell((Unit*)nullptr, SPELL_HARVESTED_SOUL_LK_BUFF, true, nullptr, nullptr, _instance->GetData64(DATA_THE_LICH_KING));
}
_events.Reset();
@@ -3194,7 +3194,7 @@ public:
{
if (summoner->IsAlive() && summoner->GetTypeId() == TYPEID_PLAYER)
{
summoner->CastSpell((Unit*)NULL, SPELL_HARVEST_SOUL_VISUAL, true);
summoner->CastSpell((Unit*)nullptr, SPELL_HARVEST_SOUL_VISUAL, true);
summoner->ExitVehicle(summoner);
me->UpdatePosition(me->GetPositionX(), me->GetPositionY(), 840.87f, me->GetOrientation(), true);
me->StopMovingOnCurrentPos();
@@ -3272,7 +3272,7 @@ public:
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
{
_events.Reset();
me->CastSpell((Unit*)NULL, SPELL_RESTORE_SOUL, false);
me->CastSpell((Unit*)nullptr, SPELL_RESTORE_SOUL, false);
me->DespawnOrUnsummon(3000);
}
break;
@@ -3292,7 +3292,7 @@ public:
_events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000);
if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f))
{
warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, false);
warden->CastSpell((Unit*)nullptr, SPELL_DESTROY_SOUL, false);
warden->DespawnOrUnsummon(2000);
}
me->CastSpell(me, SPELL_TERENAS_LOSES_INSIDE, false);
@@ -3317,7 +3317,7 @@ public:
me->SetControlled(false, UNIT_STATE_ROOT);
Talk(SAY_TERENAS_INTRO_1);
if (IsHeroic())
me->CastSpell((Unit*)NULL, SPELL_RESTORE_SOULS, false);
me->CastSpell((Unit*)nullptr, SPELL_RESTORE_SOULS, false);
break;
case EVENT_FROSTMOURNE_TALK_2:
Talk(SAY_TERENAS_INTRO_2);
@@ -3327,7 +3327,7 @@ public:
break;
case EVENT_DESTROY_SOUL:
if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f))
warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, false);
warden->CastSpell((Unit*)nullptr, SPELL_DESTROY_SOUL, false);
me->CastSpell(me, SPELL_TERENAS_LOSES_INSIDE, false);
me->SetDisplayId(16946);
me->SetReactState(REACT_PASSIVE);
@@ -3523,7 +3523,7 @@ public:
{
PreventDefaultAction();
int32 heal = int32(eventInfo.GetDamageInfo()->GetDamage() / 2);
GetTarget()->CastCustomSpell(SPELL_DARK_HUNGER_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, NULL, aurEff);
GetTarget()->CastCustomSpell(SPELL_DARK_HUNGER_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, nullptr, aurEff);
}
void Register() override
@@ -3552,7 +3552,7 @@ public:
PreventDefaultAction();
// shouldn't be needed, this is channeled
if (Unit* caster = GetCaster())
caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, NULL, aurEff, GetCasterGUID());
caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, nullptr, aurEff, GetCasterGUID());
}
void Register() override
@@ -3600,7 +3600,7 @@ public:
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
GetHitUnit()->CastSpell((Unit*)NULL, uint32(GetEffectValue()), true);
GetHitUnit()->CastSpell((Unit*)nullptr, uint32(GetEffectValue()), true);
}
void Register() override
@@ -3657,7 +3657,7 @@ public:
{
timer = 0;
me->RemoveAllAuras();
me->CastSpell((Unit*)NULL, SPELL_EXPLOSION, false);
me->CastSpell((Unit*)nullptr, SPELL_EXPLOSION, false);
me->DespawnOrUnsummon(1000);
}
else

6
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
View File

@@ -333,7 +333,7 @@ public:
_instance->DoRemoveAurasDueToSpellOnPlayers(70766);
me->RemoveAurasDueToSpell(SPELL_CORRUPTION_VALITHRIA);
me->CastSpell(me, SPELL_ACHIEVEMENT_CHECK, true);
me->CastSpell((Unit*)NULL, SPELL_DREAMWALKERS_RAGE, false);
me->CastSpell((Unit*)nullptr, SPELL_DREAMWALKERS_RAGE, false);
_events.Reset();
_events.ScheduleEvent(EVENT_DREAM_SLIP, 3500);
_instance->SetBossState(DATA_VALITHRIA_DREAMWALKER, DONE);
@@ -977,7 +977,7 @@ public:
return;
if (!me->HasUnitState(UNIT_STATE_CASTING) && !me->isMoving() && me->IsWithinMeleeRange(me->GetVictim()))
me->CastSpell((Unit*)NULL, SPELL_SUPPRESSION, false);
me->CastSpell((Unit*)nullptr, SPELL_SUPPRESSION, false);
}
};
@@ -1169,7 +1169,7 @@ public:
return;
if (InstanceScript* instance = GetHitUnit()->GetInstanceScript())
GetHitUnit()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_VALITHRIA_DREAMWALKER));
GetHitUnit()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, nullptr, nullptr, instance->GetData64(DATA_VALITHRIA_DREAMWALKER));
}
void Register() override

6
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -1691,7 +1691,7 @@ public:
case 0:
break;
case 1: // Ice Trap
me->CastSpell((Unit*)NULL, 71249, false);
me->CastSpell((Unit*)nullptr, 71249, false);
events.RepeatEvent(urand(35000, 40000));
break;
case 2: // Rapid Shot
@@ -1734,7 +1734,7 @@ public:
events.RepeatEvent(urand(40000, 50000));
break;
case 33: // Twisted Winds
me->CastSpell((Unit*)NULL, 71306, false);
me->CastSpell((Unit*)nullptr, 71306, false);
events.RepeatEvent(urand(35000, 50000));
break;
case 41: // Empowered Shadow Bolt
@@ -2536,7 +2536,7 @@ public:
void HandleDummy()
{
for (uint8 i = 0; i < 10; ++i)
GetCaster()->CastSpell((Unit*)NULL, 70963, true);
GetCaster()->CastSpell((Unit*)nullptr, 70963, true);
}
void Register() override

8
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -1590,7 +1590,7 @@ public:
return;
stalkers.sort(acore::ObjectDistanceOrderPred(teleporter));
stalkers.front()->CastSpell((Unit*)NULL, SPELL_ARTHAS_TELEPORTER_CEREMONY, false);
stalkers.front()->CastSpell((Unit*)nullptr, SPELL_ARTHAS_TELEPORTER_CEREMONY, false);
stalkers.pop_front();
for (std::list<Creature*>::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr)
(*itr)->AI()->Reset();
@@ -1749,7 +1749,7 @@ public:
}
case EVENT_REBUILD_PLATFORM:
if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID))
platform->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);
platform->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true);
if (GameObject* edge = instance->GetGameObject(FrozenThroneEdgeGUID))
edge->SetGoState(GO_STATE_READY);
if (GameObject* wind = instance->GetGameObject(FrozenThroneWindGUID))
@@ -1815,7 +1815,7 @@ public:
}
break;
case EVENT_TELEPORT_TO_FROSMOURNE: // Harvest Soul (normal mode)
if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, NULL, 65000))
if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, nullptr, 65000))
{
terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO);
std::list<Creature*> triggers;
@@ -1827,7 +1827,7 @@ public:
visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true);
}
if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, NULL, 65000))
if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, nullptr, 65000))
{
terenas->AI()->AttackStart(warden);
warden->AddThreat(terenas, 300000.0f);