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

10
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
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);

6
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
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

6
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
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;
}

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
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;

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
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);
}
}