diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-07-21 17:56:55 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2017-07-21 18:02:48 +0200 |
| commit | c7896f31026d6bdee189226680705dd7965b2039 (patch) | |
| tree | 704df5ec522361dc14d4351b4c9106e31f0ab0ae /src/server/scripts/World | |
| parent | 42c993f8add11a9f5cb32fed6144648c10f5a4ee (diff) | |
Core/Unit: For convenience, explicitly redirect CastSpell with nullptr as first argument to the Unit* overloads. No more ->CastSpell((Unit*)nullptr, ...) all over the place!
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/boss_emerald_dragons.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index f510b5c6839..96daefc124c 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -398,7 +398,7 @@ class boss_lethon : public CreatureScript switch (eventId) { case EVENT_SHADOW_BOLT_WHIRL: - me->CastSpell((Unit*)nullptr, SPELL_SHADOW_BOLT_WHIRL, false); + me->CastSpell(nullptr, SPELL_SHADOW_BOLT_WHIRL, false); events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, urand(15000, 30000)); break; default: @@ -438,7 +438,7 @@ class npc_spirit_shade : public CreatureScript { if (moveType == FOLLOW_MOTION_TYPE && data == _summonerGuid.GetCounter()) { - me->CastSpell((Unit*)nullptr, SPELL_DARK_OFFERING, false); + me->CastSpell(nullptr, SPELL_DARK_OFFERING, false); me->DespawnOrUnsummon(1000); } } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 03631c5b808..dd8e313e54d 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1603,7 +1603,7 @@ class npc_tournament_mount : public CreatureScript if (apply) { _pennantSpellId = GetPennantSpellId(player); - player->CastSpell((Unit*)nullptr, _pennantSpellId, true); + player->CastSpell(nullptr, _pennantSpellId, true); } else player->RemoveAurasDueToSpell(_pennantSpellId); |