nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 02:50:29 +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

16
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
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:

8
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
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);
}

6
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
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:

2
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
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;
}
}

4
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
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);
}
}

28
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
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

6
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
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;
}

12
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
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;

8
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
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);
}

12
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
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);