sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests 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
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+1 -1
View File
@@ -178,7 +178,7 @@ public:
case EVENT_HADRONOX_MOVE2:
case EVENT_HADRONOX_MOVE3:
Talk(SAY_HADRONOX_EMOTE);
me->GetMotionMaster()->MoveCharge(hadronoxSteps[eventId - 1].GetPositionX(), hadronoxSteps[eventId - 1].GetPositionY(), hadronoxSteps[eventId - 1].GetPositionZ(), 10.0f, 0, NULL, true);
me->GetMotionMaster()->MoveCharge(hadronoxSteps[eventId - 1].GetPositionX(), hadronoxSteps[eventId - 1].GetPositionY(), hadronoxSteps[eventId - 1].GetPositionZ(), 10.0f, 0, nullptr, true);
break;
}
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+4 -4
View File
@@ -650,7 +650,7 @@ public:
}
break;
case EVENT_TWILIGHT_MENDING:
me->CastSpell((Unit*)NULL, SPELL_TWILIGHT_MENDING, true);
me->CastSpell((Unit*)nullptr, SPELL_TWILIGHT_MENDING, true);
break;
case EVENT_CHECK_CORPOREALITY:
UpdateCorporeality();
@@ -751,7 +751,7 @@ public:
void UpdateAI(uint32 /*diff*/) override
{
if (!me->HasUnitState(UNIT_STATE_CASTING))
me->CastSpell((Unit*)NULL, SPELL_TRACK_ROTATION, false);
me->CastSpell((Unit*)nullptr, SPELL_TRACK_ROTATION, false);
}
void DoAction(int32 action) override
@@ -1122,7 +1122,7 @@ public:
{
Unit* caster = GetCaster();
caster->CastSpell(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ(), SPELL_SUMMON_TWILIGHT_PORTAL, true);
caster->GetMap()->SummonCreature(NPC_TWILIGHT_HALION, caster->ToCreature()->GetHomePosition(), NULL, 0, caster);
caster->GetMap()->SummonCreature(NPC_TWILIGHT_HALION, caster->ToCreature()->GetHomePosition(), nullptr, 0, caster);
}
void Register() override
@@ -1258,7 +1258,7 @@ public:
void HandlePeriodic(AuraEffect const* aurEff)
{
PreventDefaultAction();
GetUnitOwner()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true);
GetUnitOwner()->CastSpell((Unit*)nullptr, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true);
}
void Register() override
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+8 -8
View File
@@ -137,7 +137,7 @@ public:
damage = me->GetHealth() - 1;
if( me->getFaction() != 35 )
{
me->CastSpell((Unit*)NULL, 68575, true); // achievements
me->CastSpell((Unit*)nullptr, 68575, true); // achievements
me->GetMap()->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, 68574, me); // paletress' spell credits encounter, but shouldn't credit achievements
me->setFaction(35);
events.Reset();
@@ -167,7 +167,7 @@ public:
case 0:
break;
case EVENT_SPELL_RADIANCE:
me->CastSpell((Unit*)NULL, SPELL_RADIANCE, false);
me->CastSpell((Unit*)nullptr, SPELL_RADIANCE, false);
me->MonsterTextEmote(TEXT_RADIATE, 0, true);
events.RepeatEvent(16000);
break;
@@ -285,7 +285,7 @@ public:
if( me->getFaction() != 35 )
{
me->CastSpell((Unit*)NULL, 68574, true); // achievements
me->CastSpell((Unit*)nullptr, 68574, true); // achievements
me->setFaction(35);
events.Reset();
Talk(TEXT_PALETRESS_DEATH);
@@ -327,11 +327,11 @@ public:
{
me->InterruptNonMeleeSpells(true);
Talk(TEXT_PALETRESS_MEMORY_SUMMON);
me->CastSpell((Unit*)NULL, SPELL_HOLY_NOVA, false);
me->CastSpell((Unit*)nullptr, SPELL_HOLY_NOVA, false);
me->CastSpell(me, SPELL_SHIELD, false);
me->CastSpell((Unit*)NULL, SPELL_SUMMON_MEMORY, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_MEMORY, false);
SummonMemory();
me->CastSpell((Unit*)NULL, SPELL_CONFESS, false);
me->CastSpell((Unit*)nullptr, SPELL_CONFESS, false);
events.ScheduleEvent(EVENT_SPELL_RENEW, urand(6000, 8000));
summoned = true;
return;
@@ -610,7 +610,7 @@ public:
damage = me->GetHealth() - 1;
events.DelayEvents(10000);
me->CastSpell(me, SPELL_DIVINE_SHIELD_H, true);
me->CastSpell((Unit*)NULL, SPELL_FINAL_MEDITATION_H, true);
me->CastSpell((Unit*)nullptr, SPELL_FINAL_MEDITATION_H, true);
}
}
@@ -678,7 +678,7 @@ public:
events.RepeatEvent(urand(12000, 15000));
break;
case EVENT_PRIESTESS_SPELL_FOUNTAIN_OF_LIGHT:
me->CastSpell((Unit*)NULL, SPELL_FOUNTAIN_OF_LIGHT, false);
me->CastSpell((Unit*)nullptr, SPELL_FOUNTAIN_OF_LIGHT, false);
events.RepeatEvent(urand(35000, 45000));
break;
case EVENT_PRIESTESS_SPELL_MIND_CONTROL_H:
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+4 -4
View File
@@ -161,7 +161,7 @@ public:
pInstance->SetData(BOSS_BLACK_KNIGHT, IN_PROGRESS);
Talk(TEXT_BK_AGGRO);
me->CastSpell((Unit*)NULL, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false);
me->CastSpell((Unit*)nullptr, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false);
if( Creature* announcer = pInstance->instance->GetCreature(pInstance->GetData64(DATA_ANNOUNCER)) )
announcer->DespawnOrUnsummon();
@@ -265,7 +265,7 @@ public:
events.RepeatEvent(urand(14000, 17000));
break;
case EVENT_SPELL_DEATH_BITE:
me->CastSpell((Unit*)NULL, SPELL_DEATH_BITE, false);
me->CastSpell((Unit*)nullptr, SPELL_DEATH_BITE, false);
events.RepeatEvent(urand(2000, 4000));
break;
case EVENT_SPELL_MARKED_DEATH:
@@ -301,7 +301,7 @@ public:
void JustDied(Unit* /*killer*/) override
{
me->CastSpell((Unit*)NULL, SPELL_BK_KILL_CREDIT, true);
me->CastSpell((Unit*)nullptr, SPELL_BK_KILL_CREDIT, true);
Talk(TEXT_BK_DEATH);
if( pInstance )
pInstance->SetData(BOSS_BLACK_KNIGHT, DONE);
@@ -327,7 +327,7 @@ public:
void Reset() override
{
Start(false, true, 0, NULL);
Start(false, true, 0, nullptr);
SetDespawnAtEnd(true);
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+3 -3
View File
@@ -781,7 +781,7 @@ public:
events.RepeatEvent(5000);
break;
case EVEMT_MAGE_SPELL_BLAST_WAVE:
me->CastSpell((Unit*)NULL, SPELL_BLAST_WAVE, false);
me->CastSpell((Unit*)nullptr, SPELL_BLAST_WAVE, false);
events.RepeatEvent(13000);
break;
case EVEMT_MAGE_SPELL_HASTE:
@@ -832,7 +832,7 @@ public:
break;
case EVENT_HUNTER_SPELL_LIGHTNING_ARROWS:
me->CastSpell((Unit*)NULL, SPELL_LIGHTNING_ARROWS, false);
me->CastSpell((Unit*)nullptr, SPELL_LIGHTNING_ARROWS, false);
events.RepeatEvent(urand(20000, 25000));
break;
case EVENT_HUNTER_SPELL_MULTI_SHOT:
@@ -879,7 +879,7 @@ public:
events.RepeatEvent(8000);
break;
case EVENT_ROGUE_SPELL_FAN_OF_KNIVES:
me->CastSpell((Unit*)NULL, SPELL_FAN_OF_KNIVES, false);
me->CastSpell((Unit*)nullptr, SPELL_FAN_OF_KNIVES, false);
events.RepeatEvent(14000);
break;
case EVENT_ROGUE_SPELL_POISON_BOTTLE:
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+1 -1
View File
@@ -605,7 +605,7 @@ public:
c->GetMotionMaster()->MovePoint(9, 747.36f, 670.07f, 411.9f);
if (!creditCasted)
{
c->CastSpell((Unit*)NULL, 68572, true);
c->CastSpell((Unit*)nullptr, 68572, true);
creditCasted = true;
}
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+2 -2
View File
@@ -246,7 +246,7 @@ public:
events.CancelEvent(EVENT_EMERGE_2);
if( !IsHeroic() )
events.CancelEvent(EVENT_SUMMON_NERUBIAN);
me->CastSpell((Unit*)NULL, SPELL_LEECHING_SWARM, false);
me->CastSpell((Unit*)nullptr, SPELL_LEECHING_SWARM, false);
Talk(EMOTE_LEECHING_SWARM);
Talk(SAY_LEECHING_SWARM);
return;
@@ -855,7 +855,7 @@ public:
Remove();
return;
}
target->CastSpell((Unit*)NULL, SPELL_IMPALE, true);
target->CastSpell((Unit*)nullptr, SPELL_IMPALE, true);
}
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+14 -14
View File
@@ -446,9 +446,9 @@ public:
break;
case EVENT_SPELL_HEROISM_OR_BLOODLUST:
if( me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION )
me->CastSpell((Unit*)NULL, SPELL_HEROISM, true);
me->CastSpell((Unit*)nullptr, SPELL_HEROISM, true);
else
me->CastSpell((Unit*)NULL, SPELL_BLOODLUST, true);
me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, true);
events.RepeatEvent(600000);
EventMapGCD(events, 1500);
break;
@@ -719,7 +719,7 @@ public:
case EVENT_SPELL_PSYCHIC_SCREAM:
if( HealthBelowPct(50) && EnemiesInRange(8.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_PSYCHIC_SCREAM, false);
me->CastSpell((Unit*)nullptr, SPELL_PSYCHIC_SCREAM, false);
events.RepeatEvent(30000);
EventMapGCD(events, 1500);
}
@@ -869,7 +869,7 @@ public:
case EVENT_SPELL_PSYCHIC_SCREAM:
if( EnemiesInRange(8.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_PSYCHIC_SCREAM, false);
me->CastSpell((Unit*)nullptr, SPELL_PSYCHIC_SCREAM, false);
events.RepeatEvent(30000);
EventMapGCD(events, 1500);
}
@@ -972,7 +972,7 @@ public:
case EVENT_SPELL_HELLFIRE:
if( EnemiesInRange(9.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_HELLFIRE, false);
me->CastSpell((Unit*)nullptr, SPELL_HELLFIRE, false);
events.RepeatEvent(30000);
EventMapGCD(events, 1500);
}
@@ -1117,7 +1117,7 @@ public:
case EVENT_SPELL_ARCANE_EXPLOSION:
if( EnemiesInRange(9.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_ARCANE_EXPLOSION, false);
me->CastSpell((Unit*)nullptr, SPELL_ARCANE_EXPLOSION, false);
events.RepeatEvent(6000);
EventMapGCD(events, 1500);
}
@@ -1127,7 +1127,7 @@ public:
case EVENT_SPELL_BLINK:
if( HealthBelowPct(50) && EnemiesInRange(10.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_FROST_NOVA, false);
me->CastSpell((Unit*)nullptr, SPELL_FROST_NOVA, false);
events.RepeatEvent(15000);
EventMapGCD(events, 1500);
// blink disabled, fucking movement shit not working
@@ -1462,7 +1462,7 @@ public:
EventMapGCD(events, 1500);
break;
case EVENT_SPELL_FORCE_OF_NATURE:
me->CastSpell((Unit*)NULL, SPELL_FORCE_OF_NATURE, false);
me->CastSpell((Unit*)nullptr, SPELL_FORCE_OF_NATURE, false);
events.RepeatEvent(180000);
EventMapGCD(events, 1500);
break;
@@ -1566,7 +1566,7 @@ public:
case EVENT_SPELL_INTIMIDATING_SHOUT:
if( EnemiesInRange(8.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_INTIMIDATING_SHOUT, false);
me->CastSpell((Unit*)nullptr, SPELL_INTIMIDATING_SHOUT, false);
events.RepeatEvent(120000);
EventMapGCD(events, 1500);
}
@@ -2102,14 +2102,14 @@ public:
break;
case EVENT_SPELL_HEROISM_OR_BLOODLUST:
if( me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION )
me->CastSpell((Unit*)NULL, SPELL_HEROISM, true);
me->CastSpell((Unit*)nullptr, SPELL_HEROISM, true);
else
me->CastSpell((Unit*)NULL, SPELL_BLOODLUST, true);
me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, true);
events.RepeatEvent(600000);
EventMapGCD(events, 1500);
break;
case EVENT_SUMMON_TOTEM:
me->CastSpell((Unit*)NULL, RAND(SPELL_GROUNDING_TOTEM, SPELL_WINDFURY_TOTEM, SPELL_TREMOR_TOTEM), false);
me->CastSpell((Unit*)nullptr, RAND(SPELL_GROUNDING_TOTEM, SPELL_WINDFURY_TOTEM, SPELL_TREMOR_TOTEM), false);
events.RepeatEvent(30000);
EventMapGCD(events, 1500);
break;
@@ -2231,7 +2231,7 @@ public:
}
if( EnemiesInRange(5.0f) >= 3 )
{
me->CastSpell((Unit*)NULL, SPELL_DIVINE_STORM, false);
me->CastSpell((Unit*)nullptr, SPELL_DIVINE_STORM, false);
events.RepeatEvent(urand(10000, 15000));
EventMapGCD(events, 1500);
}
@@ -2474,7 +2474,7 @@ public:
void HandleDispel(DispelInfo* dispelInfo)
{
if (Unit* caster = GetCaster())
caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, NULL, GetEffect(EFFECT_0));
caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, nullptr, GetEffect(EFFECT_0));
}
void Register() override
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+3 -3
View File
@@ -232,14 +232,14 @@ public:
case EVENT_SUMMON_NETHER_PORTAL:
Talk(EMOTE_NETHER_PORTAL);
Talk(SAY_MISTRESS_OF_PAIN);
me->CastSpell((Unit*)NULL, SPELL_SUMMON_NETHER_PORTAL, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_NETHER_PORTAL, false);
events.RescheduleEvent(EVENT_SUMMON_VOLCANO, 60000);
break;
case EVENT_SUMMON_VOLCANO:
Talk(EMOTE_INFERNAL_ERUPTION);
Talk(SAY_INFERNAL_ERUPTION);
me->CastSpell((Unit*)NULL, SPELL_SUMMON_VOLCANO, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_VOLCANO, false);
events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 60000);
break;
@@ -410,7 +410,7 @@ public:
events.RepeatEvent(urand(25000, 30000));
break;
case EVENT_SPELL_MISTRESS_KISS:
me->CastSpell((Unit*)NULL, SPELL_MISTRESS_KISS, false);
me->CastSpell((Unit*)nullptr, SPELL_MISTRESS_KISS, false);
events.RepeatEvent(urand(25000, 35000));
break;
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+6 -6
View File
@@ -149,7 +149,7 @@ public:
break;
case EVENT_SPELL_SNOBOLLED:
if( t->GetTypeId() == TYPEID_PLAYER )
me->CastSpell((Unit*)NULL, SPELL_SNOBOLLED, true);
me->CastSpell((Unit*)nullptr, SPELL_SNOBOLLED, true);
break;
case EVENT_SPELL_BATTER:
@@ -290,7 +290,7 @@ public:
events.RepeatEvent(2500);
break;
case EVENT_SPELL_STAGGERING_STOMP:
me->CastSpell((Unit*)NULL, SPELL_STAGGERING_STOMP, false);
me->CastSpell((Unit*)nullptr, SPELL_STAGGERING_STOMP, false);
events.RepeatEvent(urand(20000, 25000));
break;
case EVENT_PICK_SNOBOLD_TARGET:
@@ -615,7 +615,7 @@ struct boss_jormungarAI : public ScriptedAI
events.RepeatEvent(20000);
break;
case EVENT_SPELL_SWEEP:
me->CastSpell((Unit*)NULL, SPELL_SWEEP_0, false);
me->CastSpell((Unit*)nullptr, SPELL_SWEEP_0, false);
events.RepeatEvent(urand(15000, 30000));
break;
case EVENT_SPELL_BITE:
@@ -833,7 +833,7 @@ public:
if( !DoTrampleIfValid() )
{
me->CastSpell(me, SPELL_STAGGERED_DAZE, true);
me->CastSpell((Unit*)NULL, SPELL_TRAMPLE, true);
me->CastSpell((Unit*)nullptr, SPELL_TRAMPLE, true);
Talk(EMOTE_TRAMPLE_CRASH);
events.DelayEvents(15000);
}
@@ -867,7 +867,7 @@ public:
events.RepeatEvent(urand(15000, 30000));
break;
case EVENT_SPELL_WHIRL:
me->CastSpell((Unit*)NULL, SPELL_WHIRL, false);
me->CastSpell((Unit*)nullptr, SPELL_WHIRL, false);
events.RepeatEvent(urand(15000, 20000));
break;
case EVENT_SPELL_ARCTIC_BREATH:
@@ -888,7 +888,7 @@ public:
break;
case EVENT_SPELL_MASSIVE_CRASH:
me->GetMotionMaster()->Clear();
me->CastSpell((Unit*)NULL, SPELL_MASSIVE_CRASH, false);
me->CastSpell((Unit*)nullptr, SPELL_MASSIVE_CRASH, false);
events.RescheduleEvent(EVENT_GAZE, 2000);
break;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+4 -4
View File
@@ -402,7 +402,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
switch( s )
{
case 0: // light vortex
me->CastSpell((Unit*)NULL, SPELL_LIGHT_VORTEX, false);
me->CastSpell((Unit*)nullptr, SPELL_LIGHT_VORTEX, false);
Talk(EMOTE_VORTEX);
Talk(SAY_LIGHT);
if( Creature* twin = GetSister() )
@@ -411,7 +411,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
case 1: // dark vortex
if( Creature* twin = GetSister() )
{
twin->CastSpell((Unit*)NULL, SPELL_DARK_VORTEX, false);
twin->CastSpell((Unit*)nullptr, SPELL_DARK_VORTEX, false);
twin->AI()->Talk(EMOTE_VORTEX);
twin->AI()->Talk(SAY_NIGHT);
Talk(SAY_NIGHT);
@@ -835,7 +835,7 @@ public:
CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
int32 dmg = urand(2925, 3075) * (caster->GetMap()->GetDifficulty() - 1);
if (caster->CanApplyResilience())
Unit::ApplyResilience(plr, NULL, &dmg, false, CR_CRIT_TAKEN_SPELL);
Unit::ApplyResilience(plr, nullptr, &dmg, false, CR_CRIT_TAKEN_SPELL);
uint32 damage = dmg;
Unit::CalcAbsorbResist(caster, plr, GetSpellInfo()->GetSchoolMask(), DOT, damage, &absorb, &resist, GetSpellInfo());
Unit::DealDamageMods(plr, damage, &absorb);
@@ -880,7 +880,7 @@ public:
{
me->AI()->DoAction(1); // despawning = true;
me->GetMotionMaster()->MoveIdle();
me->CastSpell((Unit*)NULL, me->GetEntry() == NPC_CONCENTRATED_LIGHT ? SPELL_UNLEASHED_LIGHT : SPELL_UNLEASHED_DARK, false);
me->CastSpell((Unit*)nullptr, me->GetEntry() == NPC_CONCENTRATED_LIGHT ? SPELL_UNLEASHED_LIGHT : SPELL_UNLEASHED_DARK, false);
me->SetDisplayId(11686);
me->DespawnOrUnsummon(1500);
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+6 -6
View File
@@ -324,7 +324,7 @@ public:
case TYPE_GORMOK:
if( data == DONE )
{
if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], NULL, 25000))
if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], nullptr, 25000))
{
trigger->SetDisplayId(11686);
trigger->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -346,7 +346,7 @@ public:
{
if( ++Counter == 2 )
{
if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], NULL, 25000))
if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], nullptr, 25000))
{
trigger->SetDisplayId(11686);
trigger->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -533,7 +533,7 @@ public:
events.RescheduleEvent(EVENT_SCENE_501, 20000);
}
if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) )
floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);
floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true);
}
break;
}
@@ -1327,7 +1327,7 @@ public:
{
if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) )
floor->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED);//floor->ModifyHealth(-10000000, c);
c->CastSpell((Unit*)NULL, 68193, true);
c->CastSpell((Unit*)nullptr, 68193, true);
c->SetVisible(false);
c->SetDisplayId(11686);
if( Creature* t = c->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f, true) )
@@ -1539,7 +1539,7 @@ public:
case INSTANCE_PROGRESS_VALKYR_DEAD:
case INSTANCE_PROGRESS_ANUB_ARAK:
/*if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) )
floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);*/
floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true);*/
if (Creature* c = instance->GetCreature(NPC_BarrettGUID))
{
if (InstanceProgress == INSTANCE_PROGRESS_ANUB_ARAK)
@@ -1570,7 +1570,7 @@ public:
break;
case INSTANCE_PROGRESS_DONE:
if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) )
floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);
floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true);
if( Creature* c = instance->GetCreature(NPC_BarrettGUID) )
{
c->SetVisible(false);
src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+1 -1
View File
@@ -319,7 +319,7 @@ public:
void HandleScript(SpellEffIndex /*effIndex*/)
{
for (uint8 i = 0; i < 4; ++i)
GetCaster()->CastSpell((Unit*)NULL, SPELL_COPY_OF_SUMMON_MINIONS, true);
GetCaster()->CastSpell((Unit*)nullptr, SPELL_COPY_OF_SUMMON_MINIONS, true);
}
void Register() override
src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+2 -2
View File
@@ -149,7 +149,7 @@ public:
{
Talk(SAY_FLESH);
me->getThreatManager().resetAllAggro();
me->CastSpell((Unit*)NULL, SPELL_TURN_FLESH, false);
me->CastSpell((Unit*)nullptr, SPELL_TURN_FLESH, false);
events.Reset();
events.ScheduleEvent(EVENT_TURN_FLESH_REAL, 3000);
@@ -246,7 +246,7 @@ public:
PreventDefaultAction();
GetUnitOwner()->getThreatManager().resetAllAggro();
GetUnitOwner()->GetMotionMaster()->Clear();
GetUnitOwner()->CastSpell((Unit*)NULL, SPELL_TURN_BONES, false);
GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false);
GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES);
}
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+2 -2
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;
}
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+2 -2
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);
}
}
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+10 -10
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
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+2 -2
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:
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+1 -1
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);
}
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+2 -2
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
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+2 -2
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);
}
}
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+3 -3
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
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+2 -2
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:
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+8 -8
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
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+1 -1
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:
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+2 -2
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*/)
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+3 -3
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;
}
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+4 -4
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
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+49 -49
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
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+3 -3
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
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+3 -3
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
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+4 -4
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);
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ public:
me->DisableSpline();
me->SetFacingTo(ZapAngle);
me->SetControlled(true, UNIT_STATE_ROOT);
me->CastSpell((Unit*)NULL, SPELL_ENERGIZE_CORES, false);
me->CastSpell((Unit*)nullptr, SPELL_ENERGIZE_CORES, false);
ZapAngle += M_PI / 2;
if( ZapAngle >= 2 * M_PI )
ZapAngle -= 2 * M_PI;
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+1 -1
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;
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+2 -2
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);
}
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+14 -14
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
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+3 -3
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
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+1 -1
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);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+5 -5
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;
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+9 -9
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
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+1 -1
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))
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+5 -5
View File
@@ -309,9 +309,9 @@ public:
me->_AddCreatureSpellCooldown(SPELL_DREADFUL_ROAR, 0);
if (me->GetDisplayId() == DISPLAYID_DEFAULT)
me->CastSpell((Unit*)NULL, SPELL_STAGGERING_ROAR, false);
me->CastSpell((Unit*)nullptr, SPELL_STAGGERING_ROAR, false);
else
me->CastSpell((Unit*)NULL, SPELL_DREADFUL_ROAR, false);
me->CastSpell((Unit*)nullptr, SPELL_DREADFUL_ROAR, false);
events.RepeatEvent(urand(15000, 20000));
break;
case EVENT_SPELL_CLEAVE_OR_WOE_STRIKE:
@@ -336,9 +336,9 @@ public:
me->DisableRotate(true);
me->SendMovementFlagUpdate();
if (me->GetDisplayId() == DISPLAYID_DEFAULT)
me->CastSpell((Unit*)NULL, SPELL_SMASH, false);
me->CastSpell((Unit*)nullptr, SPELL_SMASH, false);
else
me->CastSpell((Unit*)NULL, SPELL_DARK_SMASH, false);
me->CastSpell((Unit*)nullptr, SPELL_DARK_SMASH, false);
events.RepeatEvent(urand(9000, 11000));
events.RescheduleEvent(EVENT_UNROOT, 3750);
break;
@@ -350,7 +350,7 @@ public:
}
else
{
me->CastSpell((Unit*)NULL, SPELL_SHADOW_AXE, true);
me->CastSpell((Unit*)nullptr, SPELL_SHADOW_AXE, true);
SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
events.RepeatEvent(35000);
events.RescheduleEvent(EVENT_AXE_RETURN, 10000);
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+3 -3
View File
@@ -64,7 +64,7 @@ public:
if( me->GetInstanceScript() && me->GetInstanceScript()->instance->IsHeroic() )
{
const int32 dmg = 2000;
c->CastCustomSpell(s, SPELL_FROST_TOMB_AURA, NULL, &dmg, NULL, true);
c->CastCustomSpell(s, SPELL_FROST_TOMB_AURA, nullptr, &dmg, nullptr, true);
}
else
c->CastSpell(s, SPELL_FROST_TOMB_AURA, true);
@@ -304,7 +304,7 @@ public:
break;
case EVENT_SPELL_BONE_ARMOR:
if( !me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) )
me->CastSpell((Unit*)NULL, SPELL_BONE_ARMOR, false);
me->CastSpell((Unit*)nullptr, SPELL_BONE_ARMOR, false);
events.RepeatEvent(urand(40000, 120000));
break;
case EVENT_RESURRECT:
@@ -343,7 +343,7 @@ public:
PreventDefaultAction();
if (aurEff->GetTickNumber() == 1)
if( Unit* target = GetTarget() )
target->CastSpell((Unit*)NULL, SPELL_FROST_TOMB_SUMMON, true);
target->CastSpell((Unit*)nullptr, SPELL_FROST_TOMB_SUMMON, true);
}
void Register() override
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+3 -3
View File
@@ -150,7 +150,7 @@ public:
}
}
me->CastSpell((Unit*)NULL, SPELL_SUMMON_SKARVALD_GHOST, true);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_SKARVALD_GHOST, true);
}
void UpdateAI(uint32 diff) override
@@ -303,7 +303,7 @@ public:
}
}
}
me->CastSpell((Unit*)NULL, SPELL_SUMMON_DALRONN_GHOST, true);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_DALRONN_GHOST, true);
}
void UpdateAI(uint32 diff) override
@@ -341,7 +341,7 @@ public:
events.RepeatEvent(3000);
break;
case EVENT_SPELL_SUMMON_SKELETONS:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_SKELETONS, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_SKELETONS, false);
events.RepeatEvent(urand(20000, 30000));
break;
}
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+1 -1
View File
@@ -505,7 +505,7 @@ public:
grauf->AI()->DoAction(ACTION_MYGIRL_ACHIEVEMENT);
}
go->CastSpell((Unit*)NULL, SPELL_LAUNCH_HARPOON);
go->CastSpell((Unit*)nullptr, SPELL_LAUNCH_HARPOON);
}
return true;
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+1 -1
View File
@@ -400,7 +400,7 @@ public:
if (unitTarget->GetTypeId() != TYPEID_UNIT)
return;
Unit::DealDamage(GetCaster(), unitTarget, 7000, NULL, DIRECT_DAMAGE);
Unit::DealDamage(GetCaster(), unitTarget, 7000, nullptr, DIRECT_DAMAGE);
}
}
src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+2 -2
View File
@@ -194,7 +194,7 @@ public:
void TriggerFists(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, NULL, aurEff);
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, nullptr, aurEff);
}
void Register() override
@@ -226,7 +226,7 @@ public:
void TriggerFists(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, NULL, aurEff);
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, nullptr, aurEff);
}
void Register() override
src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ public:
case 0:
break;
case EVENT_SPELL_ARCANE_VACUUM:
me->CastSpell((Unit*)NULL, SPELL_ARCANE_VACUUM, false);
me->CastSpell((Unit*)nullptr, SPELL_ARCANE_VACUUM, false);
DoResetThreat();
me->SetControlled(true, UNIT_STATE_ROOT);
me->setAttackTimer(BASE_ATTACK, 3000);
src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+2 -2
View File
@@ -108,11 +108,11 @@ public:
case 0:
break;
case EVENT_SPELL_BLOODLUST:
me->CastSpell((Unit*)NULL, SPELL_BLOODLUST, false);
me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, false);
events.RepeatEvent(urand(35000, 45000));
break;
case EVENT_SPELL_BREAK_BONDS:
me->CastSpell((Unit*)NULL, SPELL_BREAK_BONDS, false);
me->CastSpell((Unit*)nullptr, SPELL_BREAK_BONDS, false);
events.RepeatEvent(urand(16000, 22000));
break;
case EVENT_SPELL_CHAIN_HEAL:
src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ public:
{
if (uiWaterBoltVolleyTimer <= uiDiff)
{
me->CastSpell((Unit*)NULL, SPELL_WATER_BOLT_VOLLEY, false);
me->CastSpell((Unit*)nullptr, SPELL_WATER_BOLT_VOLLEY, false);
uiWaterBoltVolleyTimer = urand(10000, 15000);
}
else uiWaterBoltVolleyTimer -= uiDiff;
src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ public:
events.RepeatEvent(urand(14000, 20000));
break;
case EVENT_SPELL_CAUTERIZING_FLAMES:
me->CastSpell((Unit*)NULL, SPELL_FLAME_BREATH, false);
me->CastSpell((Unit*)nullptr, SPELL_FLAME_BREATH, false);
events.RepeatEvent(urand(10000, 16000));
break;
}
src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+3 -3
View File
@@ -96,7 +96,7 @@ public:
case 0:
break;
case EVENT_SPELL_ARCANE_BARRAGE_VOLLEY:
me->CastSpell((Unit*)NULL, SPELL_ARCANE_BARRAGE_VOLLEY, false);
me->CastSpell((Unit*)nullptr, SPELL_ARCANE_BARRAGE_VOLLEY, false);
events.RepeatEvent(20000);
break;
case EVENT_SPELL_ARCANE_BUFFET:
@@ -107,13 +107,13 @@ public:
Talk(SAY_SUMMON_ENERGY);
spheres.DespawnAll();
uint32 entry1 = RAND(SPELL_SUMMON_ETHEREAL_SPHERE_1, SPELL_SUMMON_ETHEREAL_SPHERE_2, SPELL_SUMMON_ETHEREAL_SPHERE_3);
me->CastSpell((Unit*)NULL, entry1, true);
me->CastSpell((Unit*)nullptr, entry1, true);
if (IsHeroic())
{
uint32 entry2;
do { entry2 = RAND(SPELL_SUMMON_ETHEREAL_SPHERE_1, SPELL_SUMMON_ETHEREAL_SPHERE_2, SPELL_SUMMON_ETHEREAL_SPHERE_3); }
while (entry1 == entry2);
me->CastSpell((Unit*)NULL, entry2, true);
me->CastSpell((Unit*)nullptr, entry2, true);
}
events.RepeatEvent(45000);
events.RescheduleEvent(EVENT_SPELL_ARCANE_BUFFET, 5000);
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ public:
events.RepeatEvent(urand(18000, 22000));
break;
case EVENT_SPELL_SUMMON_VOID_SENTRY:
me->CastSpell((Unit*)NULL, SPELL_SUMMON_VOID_SENTRY, false);
me->CastSpell((Unit*)nullptr, SPELL_SUMMON_VOID_SENTRY, false);
events.RepeatEvent(12000);
break;
}
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+1 -1
View File
@@ -360,7 +360,7 @@ struct violet_hold_trashAI : public npc_escortAI
{
RemoveEscortState(STATE_ESCORT_ESCORTING | STATE_ESCORT_RETURNING | STATE_ESCORT_PAUSED);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
me->CastSpell((Unit*)NULL, SPELL_DESTROY_DOOR_SEAL, true);
me->CastSpell((Unit*)nullptr, SPELL_DESTROY_DOOR_SEAL, true);
}
void EnterEvadeMode() override
src/server/scripts/Northrend/isle_of_conquest.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ public:
{
faction = me->getFaction();
me->Respawn();
me->UpdateEntry(NPC_BROKEN_KEEP_CANNON, NULL, false);
me->UpdateEntry(NPC_BROKEN_KEEP_CANNON, nullptr, false);
me->RemoveVehicleKit();
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
}
@@ -46,7 +46,7 @@ public:
{
if (spellInfo->Id == SPELL_REPAIR_TURRET_DUMMY && me->GetEntry() == NPC_BROKEN_KEEP_CANNON)
{
me->UpdateEntry(NPC_KEEP_CANNON, NULL, false);
me->UpdateEntry(NPC_KEEP_CANNON, nullptr, false);
if (faction)
me->setFaction(faction);
me->CreateVehicleKit(510, NPC_KEEP_CANNON);
src/server/scripts/Northrend/zone_borean_tundra.cpp
+1 -1
View File
@@ -585,7 +585,7 @@ public:
EnterEvadeMode(); //We make sure that the npc is not attacking the player!
me->SetReactState(REACT_PASSIVE);
StartFollow(pCaster->ToPlayer(), 0, nullptr);
me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, NULL, false);
me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, nullptr, false);
DoCast(me, SPELL_COSMETIC_ENSLAVE_CHAINS_SELF, true);
me->DespawnOrUnsummon(45000);
src/server/scripts/Northrend/zone_dragonblight.cpp
+4 -4
View File
@@ -902,7 +902,7 @@ public:
events.ScheduleEvent(7, 11000);
break;
case 6: // repel hammer
me->CastSpell((Unit*)NULL, SPELL_SAC_REPEL_HAMMER, false);
me->CastSpell((Unit*)nullptr, SPELL_SAC_REPEL_HAMMER, false);
if (Creature* c = me->FindNearestCreature(NPC_SAC_LIGHTS_VENGEANCE_VEH_1, 150.0f, true))
c->CastSpell(c, SPELL_SAC_BLUE_EXPLOSION, true);
@@ -921,7 +921,7 @@ public:
events.ScheduleEvent(9, 11500);
break;
case 8: // summon ghouls
me->CastSpell((Unit*)NULL, SPELL_SAC_SUMMON_GHOULS_AURA, false);
me->CastSpell((Unit*)nullptr, SPELL_SAC_SUMMON_GHOULS_AURA, false);
break;
case 9: // talk 3
Talk(3);
@@ -1030,7 +1030,7 @@ public:
{
if (spell->Id == SPELL_SAC_REPEL_HAMMER && target->GetTypeId() == TYPEID_UNIT)
{
target->CastSpell((Unit*)NULL, SPELL_SAC_THROW_HAMMER, true);
target->CastSpell((Unit*)nullptr, SPELL_SAC_THROW_HAMMER, true);
target->ToCreature()->DespawnOrUnsummon(1);
if (Unit* c = target->GetVehicleBase())
c->RemoveAurasDueToSpell(SPELL_SAC_HOLY_ZONE_AURA);
@@ -1304,7 +1304,7 @@ public:
AttackStart(t);
break;
case 2:
me->CastSpell((Unit*)NULL, 70866, false);
me->CastSpell((Unit*)nullptr, 70866, false);
events.RepeatEvent(urand(30000, 35000));
break;
case 3:
src/server/scripts/Northrend/zone_icecrown.cpp
+7 -7
View File
@@ -232,7 +232,7 @@ public:
break;
case QUEST_BFV_SIGRID:
PrepareSummons();
me->MonsterTextEmote("Circling Valhalas, Sigrid Iceborn approaches to seek her revenge!", NULL, true);
me->MonsterTextEmote("Circling Valhalas, Sigrid Iceborn approaches to seek her revenge!", nullptr, true);
break;
case QUEST_BFV_CARNAGE:
events.ScheduleEvent(EVENT_VALHALAS_SECOND, 8000);
@@ -258,20 +258,20 @@ public:
{
case QUEST_BFV_FALLEN_HEROES:
me->MonsterYell("There can only be one outcome to such a battle: death for one side or the other. Let $n prove himself upon the bones of these outsiders who have fallen before!", LANG_UNIVERSAL, ObjectAccessor::GetPlayer(*me, playerGUID));
me->MonsterTextEmote("The fallen heroes of Valhalas emerge from the ground to do battle once more!", NULL, true);
me->MonsterTextEmote("The fallen heroes of Valhalas emerge from the ground to do battle once more!", nullptr, true);
break;
case QUEST_BFV_DARK_MASTER:
me->MonsterTextEmote("Khit'rix the Dark Master skitters into Valhalas from the southeast!", NULL, true);
me->MonsterTextEmote("Khit'rix the Dark Master skitters into Valhalas from the southeast!", nullptr, true);
break;
case QUEST_BFV_CARNAGE:
me->MonsterTextEmote("Lumbering in from the south, the smell of Carnage precedes him!", NULL, true);
me->MonsterTextEmote("Lumbering in from the south, the smell of Carnage precedes him!", nullptr, true);
break;
case QUEST_BFV_THANE:
me->MonsterTextEmote("Thane Banahogg appears upon the overlook to the southeast!", NULL, true);
me->MonsterTextEmote("Thane Banahogg appears upon the overlook to the southeast!", nullptr, true);
break;
case QUEST_BFV_FINAL:
me->MonsterYell("Warriors of Jotunheim, I present to you, Blood Prince Sandoval!", LANG_UNIVERSAL, nullptr);
me->MonsterTextEmote("Without warning, Prince Sandoval magically appears within Valhalas!", NULL, true);
me->MonsterTextEmote("Without warning, Prince Sandoval magically appears within Valhalas!", nullptr, true);
break;
}
@@ -1368,7 +1368,7 @@ public:
fireCount++;
if (fireCount)
Unit::DealDamage(me, me, 3000 * fireCount, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_FIRE);
Unit::DealDamage(me, me, 3000 * fireCount, nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_FIRE);
else // Heal
me->ModifyHealth(2000);
src/server/scripts/Northrend/zone_storm_peaks.cpp
+1 -1
View File
@@ -1018,7 +1018,7 @@ public:
void HandlePeriodic(AuraEffect const* /* aurEff */)
{
if (++_counter == 5)
GetTarget()->CastSpell((Unit*)NULL, SPELL_DESPAWN_RIFT, true);
GetTarget()->CastSpell((Unit*)nullptr, SPELL_DESPAWN_RIFT, true);
}
void Register() override