Scripts: Convert DoCast(me->GetVictim(), SPELL_XXXXX); in DoCastVictim(SPELL_XXX);

9 files changed, 22 insertions, 22 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index b08eb55d7a4..1e7ae1d16b7 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -112,7 +112,7 @@ public:
             //AoESilence_Timer
             if (AoESilence_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_AOESILENCE);
+                DoCastVictim(SPELL_AOESILENCE);
                 AoESilence_Timer = urand(15000, 20000);
             }
             else AoESilence_Timer -= diff;
@@ -120,7 +120,7 @@ public:
             //ArcaneExplosion_Timer
             if (ArcaneExplosion_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_ARCANEEXPLOSION);
+                DoCastVictim(SPELL_ARCANEEXPLOSION);
                 ArcaneExplosion_Timer = 8000;
             }
             else ArcaneExplosion_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index ad1a3604354..b225faa04e0 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -71,7 +71,7 @@ public:
                 //SoulSiphon_Timer
                 if (SoulSiphon_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_SOULSIPHON);
+                    DoCastVictim(SPELL_SOULSIPHON);
                     return;
 
                     //SoulSiphon_Timer = 20000;
@@ -82,7 +82,7 @@ public:
             //CallOfTheGrave_Timer
             if (CallOftheGrave_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CALLOFTHEGRAVE);
+                DoCastVictim(SPELL_CALLOFTHEGRAVE);
                 CallOftheGrave_Timer = 30000;
             }
             else CallOftheGrave_Timer -= diff;
@@ -90,7 +90,7 @@ public:
             //Terrify_Timer
             if (Terrify_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_TERRIFY);
+                DoCastVictim(SPELL_TERRIFY);
                 Terrify_Timer = 20000;
             }
             else Terrify_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 60a95b3ffea..cdd67645213 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -92,7 +92,7 @@ public:
             //FlameShock_Timer
             if (FlameShock_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FLAMESHOCK);
+                DoCastVictim(SPELL_FLAMESHOCK);
                 FlameShock_Timer = urand(10000, 15000);
             }
             else FlameShock_Timer -= diff;
@@ -100,7 +100,7 @@ public:
             //FlameSpike_Timer
             if (FlameSpike_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FLAMESPIKE);
+                DoCastVictim(SPELL_FLAMESPIKE);
                 FlameSpike_Timer = 30000;
             }
             else FlameSpike_Timer -= diff;
@@ -108,7 +108,7 @@ public:
             //FireNova_Timer
             if (FireNova_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FIRENOVA);
+                DoCastVictim(SPELL_FIRENOVA);
                 FireNova_Timer = 40000;
             }
             else FireNova_Timer -= diff;
@@ -116,7 +116,7 @@ public:
             //ShadowBolt_Timer
             if (ShadowBolt_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SHADOWBOLT);
+                DoCastVictim(SPELL_SHADOWBOLT);
                 ShadowBolt_Timer = 2000;
             }
             else ShadowBolt_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 7b833b07abb..baac9609c57 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -731,7 +731,7 @@ public:
                     DoMeleeAttackIfReady();
                     if (cleave <= diff)
                     {
-                        DoCast(me->GetVictim(), SPELL_CLEAVE);
+                        DoCastVictim(SPELL_CLEAVE);
                         cleave = urand(2000, 6000);       //1 cleave per 2.0f-6.0fsec
                     }
                     else cleave -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 6f03ae70c81..491cbf6ea11 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -110,7 +110,7 @@ public:
             //Cleave_Timer
             if (Cleave_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CLEAVE);
+                DoCastVictim(SPELL_CLEAVE);
                 Cleave_Timer = 12000;
             }
             else Cleave_Timer -= diff;
@@ -119,7 +119,7 @@ public:
             if (Whirlwind_Timer <= diff)
             {
                 Talk(SAY_WHIRLWIND);
-                DoCast(me->GetVictim(), SPELL_WHIRLWIND);
+                DoCastVictim(SPELL_WHIRLWIND);
                 Whirlwind_Timer = 30000;
             }
             else Whirlwind_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index d482fb28894..8db98127f65 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -130,7 +130,7 @@ public:
             //CurseOfBlood_Timer
             if (CurseOfBlood_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CURSEOFBLOOD);
+                DoCastVictim(SPELL_CURSEOFBLOOD);
                 CurseOfBlood_Timer = 25000;
             }
             else CurseOfBlood_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index 326fb0e4591..857e046ec04 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -110,7 +110,7 @@ public:
             //ShadowWordPain_Timer
             if (ShadowWordPain_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SHADOWWORDPAIN);
+                DoCastVictim(SPELL_SHADOWWORDPAIN);
                 ShadowWordPain_Timer = urand(5000, 15000);
             }
             else ShadowWordPain_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index fe12bbc0c5d..3169bf754f3 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -206,7 +206,7 @@ public:
             //CrusaderStrike_Timer
             if (CrusaderStrike_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CRUSADERSTRIKE);
+                DoCastVictim(SPELL_CRUSADERSTRIKE);
                 CrusaderStrike_Timer = 10000;
             }
             else CrusaderStrike_Timer -= diff;
@@ -214,7 +214,7 @@ public:
             //HammerOfJustice_Timer
             if (HammerOfJustice_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_HAMMEROFJUSTICE);
+                DoCastVictim(SPELL_HAMMEROFJUSTICE);
                 HammerOfJustice_Timer = 60000;
             }
             else HammerOfJustice_Timer -= diff;
@@ -316,7 +316,7 @@ public:
                 if (me->IsNonMeleeSpellCasted(false))
                     me->InterruptNonMeleeSpells(false);
 
-                DoCast(me->GetVictim(), SPELL_DEEPSLEEP);
+                DoCastVictim(SPELL_DEEPSLEEP);
                 _bCanResurrectCheck = true;
                 _bCanResurrect = true;
                 return;
@@ -362,7 +362,7 @@ public:
             //HolySmite_Timer
             if (HolySmite_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_HOLYSMITE);
+                DoCastVictim(SPELL_HOLYSMITE);
                 HolySmite_Timer = 6000;
             }
             else HolySmite_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index 66457d48995..8a61b3088e1 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -71,7 +71,7 @@ public:
             //LichSlap_Timer
             if (LichSlap_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_LICHSLAP);
+                DoCastVictim(SPELL_LICHSLAP);
                 LichSlap_Timer = 45000;
             }
             else LichSlap_Timer -= diff;
@@ -79,7 +79,7 @@ public:
             //FrostboltVolley_Timer
             if (FrostboltVolley_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FROSTBOLTVOLLEY);
+                DoCastVictim(SPELL_FROSTBOLTVOLLEY);
                 FrostboltVolley_Timer = 20000;
             }
             else FrostboltVolley_Timer -= diff;
@@ -87,7 +87,7 @@ public:
             //MindFlay_Timer
             if (MindFlay_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_MINDFLAY);
+                DoCastVictim(SPELL_MINDFLAY);
                 MindFlay_Timer = 20000;
             }
             else MindFlay_Timer -= diff;
@@ -95,7 +95,7 @@ public:
             //FrostNova_Timer
             if (FrostNova_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FROSTNOVA);
+                DoCastVictim(SPELL_FROSTNOVA);
                 FrostNova_Timer = 15000;
             }
             else FrostNova_Timer -= diff;