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

27 files changed, 73 insertions, 73 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 332ac33c56b..9b1f2475c1b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -456,7 +456,7 @@ public:
             if (me->HasAura(chargeSpell))
             {
                 me->RemoveAuraFromStack(chargeSpell);
-                DoCast(me->GetVictim(), unleashSpell);
+                DoCastVictim(unleashSpell);
                 HasCast = true;
                 SoulChargeCount--;
             }
@@ -577,7 +577,7 @@ public:
             {
                 if (HandOfDeathTimer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_HAND_OF_DEATH);
+                    DoCastVictim(SPELL_HAND_OF_DEATH);
                     HandOfDeathTimer = 2000;
                 } else HandOfDeathTimer -= diff;
                 return;                                         // Don't do anything after this point.
@@ -605,7 +605,7 @@ public:
 
             if (FearTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FEAR);
+                DoCastVictim(SPELL_FEAR);
                 FearTimer = 42000;
             } else FearTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index f47ba2cc3a3..b45ace791fc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -161,7 +161,7 @@ public:
 
             if (CleaveTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CLEAVE);
+                DoCastVictim(SPELL_CLEAVE);
                 CleaveTimer = 10000+rand()%5000;
             } else CleaveTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index 6d9a66c1a64..966aed69374 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -139,13 +139,13 @@ public:
             } else FrostArmorTimer -= diff;
             if (DecayTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_DEATH_AND_DECAY);
+                DoCastVictim(SPELL_DEATH_AND_DECAY);
                 DecayTimer = 60000+rand()%20000;
                 Talk(SAY_DECAY);
             } else DecayTimer -= diff;
             if (NovaTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FROST_NOVA);
+                DoCastVictim(SPELL_FROST_NOVA);
                 NovaTimer = 30000+rand()%15000;
                 Talk(SAY_NOVA);
             } else NovaTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index 9796614d2f2..df928f30f21 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -528,7 +528,7 @@ public:
             }
             if (FlameBuffetTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FLAME_BUFFET, true);
+                DoCastVictim(SPELL_FLAME_BUFFET, true);
                 FlameBuffetTimer = 7000;
             } else FlameBuffetTimer -= diff;
             DoMeleeAttackIfReady();
@@ -630,7 +630,7 @@ public:
                 return;
             if (KnockDownTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_KNOCKDOWN);
+                DoCastVictim(SPELL_KNOCKDOWN);
                 KnockDownTimer = 15000+rand()%10000;
             } else KnockDownTimer -= diff;
             DoMeleeAttackIfReady();
@@ -858,7 +858,7 @@ public:
 
             if (ShadowBoltTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SHADOW_BOLT);
+                DoCastVictim(SPELL_SHADOW_BOLT);
                 ShadowBoltTimer = 20000+rand()%10000;
             } else ShadowBoltTimer -= diff;
 
@@ -952,12 +952,12 @@ public:
                 return;
             if (CourseTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_BANSHEE_CURSE);
+                DoCastVictim(SPELL_BANSHEE_CURSE);
                 CourseTimer = 20000+rand()%5000;
             } else CourseTimer -= diff;
             if (WailTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_BANSHEE_WAIL);
+                DoCastVictim(SPELL_BANSHEE_WAIL);
                 WailTimer = 15000+rand()%5000;
             } else WailTimer -= diff;
             if (ShellTimer <= diff)
@@ -1052,7 +1052,7 @@ public:
                 return;
             if (WebTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_WEB);
+                DoCastVictim(SPELL_WEB);
                 WebTimer = 20000+rand()%5000;
             } else WebTimer -= diff;
             DoMeleeAttackIfReady();
@@ -1142,7 +1142,7 @@ public:
                 return;
             if (ManaBurnTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_MANA_BURN);
+                DoCastVictim(SPELL_MANA_BURN);
                 ManaBurnTimer = 9000+rand()%5000;
             } else ManaBurnTimer -= diff;
             DoMeleeAttackIfReady();
@@ -1252,7 +1252,7 @@ public:
             {
                 if (!me->IsWithinDist(me->GetVictim(), 25))
                 {
-                    DoCast(me->GetVictim(), SPELL_FROST_BREATH);
+                    DoCastVictim(SPELL_FROST_BREATH);
                     me->StopMoving();
                     me->GetMotionMaster()->Clear();
                     FrostBreathTimer = 4000;
@@ -1387,7 +1387,7 @@ public:
             {
                 if (me->IsWithinDist(me->GetVictim(), 20))
                 {
-                    DoCast(me->GetVictim(), SPELL_GARGOYLE_STRIKE);
+                    DoCastVictim(SPELL_GARGOYLE_STRIKE);
                     me->StopMoving();
                     me->GetMotionMaster()->Clear();
                     StrikeTimer = 2000+rand()%1000;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index c12171486ae..ba4439907ba 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -105,7 +105,7 @@ public:
             //Curse of twisted flesh timer
             if (uiCurseFleshTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CURSE_OF_TWISTED_FLESH);
+                DoCastVictim(SPELL_CURSE_OF_TWISTED_FLESH);
                 uiCurseFleshTimer = 37000;
             } else uiCurseFleshTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index c5828966438..31e3c033833 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -126,7 +126,7 @@ public:
             //Hammer of Justice
             if (HammerOfJustice_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_HAMMER_OF_JUSTICE);
+                DoCastVictim(SPELL_HAMMER_OF_JUSTICE);
                 HammerOfJustice_Timer = 60000;
             } else HammerOfJustice_Timer -= diff;
 
@@ -147,7 +147,7 @@ public:
             //Consecration
             if (Consecration_Timer <= diff)
             {
-                //DoCast(me->GetVictim(), SPELL_CONSECRATION);
+                //DoCastVictim(SPELL_CONSECRATION);
                 Consecration_Timer = urand(5000, 10000);
             } else Consecration_Timer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index 7421a116ec0..4352740e6f4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -107,7 +107,7 @@ public:
                 if (me->IsNonMeleeSpellCasted(false))
                     me->InterruptNonMeleeSpells(false);
 
-                DoCast(me->GetVictim(), SPELL_SAND_BREATH);
+                DoCastVictim(SPELL_SAND_BREATH);
 
                 Talk(SAY_BREATH);
 
@@ -116,7 +116,7 @@ public:
 
             if (ImpendingDeath_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_IMPENDING_DEATH);
+                DoCastVictim(SPELL_IMPENDING_DEATH);
                 ImpendingDeath_Timer = 25000+rand()%5000;
             } else ImpendingDeath_Timer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index 1fb704fb67e..db2d965f761 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -166,7 +166,7 @@ public:
             //Whirlwind
             if (Whirlwind_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_WHIRLWIND);
+                DoCastVictim(SPELL_WHIRLWIND);
                 Whirlwind_Timer = 20000+rand()%5000;
             } else Whirlwind_Timer -= diff;
 
@@ -174,7 +174,7 @@ public:
             if (Fear_Timer <= diff)
             {
                 Talk(SAY_SHOUT);
-                DoCast(me->GetVictim(), SPELL_FRIGHTENING_SHOUT);
+                DoCastVictim(SPELL_FRIGHTENING_SHOUT);
                 Fear_Timer = 25000+rand()%10000;
             } else Fear_Timer -= diff;
 
@@ -182,7 +182,7 @@ public:
             if (MortalStrike_Timer <= diff)
             {
                 Talk(SAY_MORTAL);
-                DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE);
+                DoCastVictim(SPELL_MORTAL_STRIKE);
                 MortalStrike_Timer = 20000+rand()%10000;
             } else MortalStrike_Timer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
index 3b1987e04f5..498a4368168 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
@@ -117,11 +117,11 @@ public:
                     switch (eventId)
                     {
                         case EVENT_SANDBREATH:
-                            DoCast(me->GetVictim(), SPELL_SAND_BREATH);
+                            DoCastVictim(SPELL_SAND_BREATH);
                             events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 25000));
                             break;
                         case EVENT_TIMESTOP:
-                            DoCast(me->GetVictim(), SPELL_TIME_STOP);
+                            DoCastVictim(SPELL_TIME_STOP);
                             events.ScheduleEvent(EVENT_TIMESTOP, urand(20000, 35000));
                             break;
                         case EVENT_FRENZY:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
index 79eca4f186e..d02dc0dd359 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
@@ -116,7 +116,7 @@ public:
                 switch (eventId)
                 {
                     case EVENT_ARCANE_BLAST:
-                        DoCast(me->GetVictim(), SPELL_ARCANE_BLAST);
+                        DoCastVictim(SPELL_ARCANE_BLAST);
                         events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(15000, 25000));
                         break;
                     case EVENT_TIME_LAPSE:
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index d2d5c45d864..46ef908bf37 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -89,14 +89,14 @@ public:
             //AmnenarsWrath_Timer
             if (AmnenarsWrath_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_AMNENNARSWRATH);
+                DoCastVictim(SPELL_AMNENNARSWRATH);
                 AmnenarsWrath_Timer = 12000;
             } else AmnenarsWrath_Timer -= diff;
 
             //FrostBolt_Timer
             if (FrostBolt_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FROSTBOLT);
+                DoCastVictim(SPELL_FROSTBOLT);
                 FrostBolt_Timer = 8000;
             } else FrostBolt_Timer -= diff;
 
@@ -109,7 +109,7 @@ public:
             if (!Spectrals60 && HealthBelowPct(60))
             {
                 Talk(SAY_SUMMON60);
-                DoCast(me->GetVictim(), SPELL_FROST_SPECTRES);
+                DoCastVictim(SPELL_FROST_SPECTRES);
                 Spectrals60 = true;
             }
 
@@ -122,7 +122,7 @@ public:
             if (!Spectrals30 && HealthBelowPct(30))
             {
                 Talk(SAY_SUMMON30);
-                DoCast(me->GetVictim(), SPELL_FROST_SPECTRES);
+                DoCastVictim(SPELL_FROST_SPECTRES);
                 Spectrals30 = true;
             }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 8bea6c5d058..6b63c98e7d8 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -152,7 +152,7 @@ public:
             {
                 if (uiWebTimer <= uiDiff)
                 {
-                    DoCast(me->GetVictim(), SPELL_WEB);
+                    DoCastVictim(SPELL_WEB);
                     uiWebTimer = urand(7000, 16000);
                 } else uiWebTimer -= uiDiff;
             }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 0d49302bec3..bd5f76c0c85 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -221,7 +221,7 @@ class boss_ossirian : public CreatureScript
 
                 // No kiting!
                 if (me->GetDistance(me->GetVictim()) > 60.00f && me->GetDistance(me->GetVictim()) < 120.00f)
-                    DoCast(me->GetVictim(), SPELL_SUMMON);
+                    DoCastVictim(SPELL_SUMMON);
 
                 bool ApplySupreme = true;
 
@@ -254,7 +254,7 @@ class boss_ossirian : public CreatureScript
                             events.ScheduleEvent(EVENT_SILENCE, urand(20000, 30000));
                             break;
                         case EVENT_CYCLONE:
-                            DoCast(me->GetVictim(), SPELL_CYCLONE);
+                            DoCastVictim(SPELL_CYCLONE);
                             events.ScheduleEvent(EVENT_CYCLONE, 20000);
                             break;
                         case EVENT_STOMP:
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index 908d2a7a691..9935248c39e 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -98,20 +98,20 @@ public:
             //Cleave_Timer
             if (Cleave_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CLEAVE);
+                DoCastVictim(SPELL_CLEAVE);
                 Cleave_Timer = urand(5000, 12000);
             } else Cleave_Timer -= diff;
 
             //ToxicVolley_Timer
             if (ToxicVolley_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_TOXIC_VOLLEY);
+                DoCastVictim(SPELL_TOXIC_VOLLEY);
                 ToxicVolley_Timer = urand(10000, 15000);
             } else ToxicVolley_Timer -= diff;
 
             if (!HealthAbovePct(5) && !Death)
             {
-                DoCast(me->GetVictim(), SPELL_POISON_CLOUD);
+                DoCastVictim(SPELL_POISON_CLOUD);
                 Death = true;
             }
 
@@ -209,7 +209,7 @@ public:
             //KnockBack_Timer
             if (KnockBack_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_KNOCKBACK);
+                DoCastVictim(SPELL_KNOCKBACK);
                 if (DoGetThreat(me->GetVictim()))
                     DoModifyThreatPercent(me->GetVictim(), -80);
                 KnockBack_Timer = urand(15000, 25000);
@@ -295,7 +295,7 @@ public:
             //Fear_Timer
             if (Fear_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FEAR);
+                DoCastVictim(SPELL_FEAR);
                 DoResetThreat();
                 Fear_Timer = 20000;
             } else Fear_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index b99b092dd7e..44b9999d9bc 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -1076,14 +1076,14 @@ public:
             //GroundRuptureTimer
             if (GroundRuptureTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE);
+                DoCastVictim(SPELL_GROUND_RUPTURE);
                 GroundRuptureTimer = 30000;
             } else GroundRuptureTimer -= diff;
 
             //HamstringTimer
             if (HamstringTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_HAMSTRING);
+                DoCastVictim(SPELL_HAMSTRING);
                 HamstringTimer = 5000;
             } else HamstringTimer -= diff;
 
@@ -1188,21 +1188,21 @@ public:
             //GroundRuptureTimer
             if (GroundRuptureTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE);
+                DoCastVictim(SPELL_GROUND_RUPTURE);
                 GroundRuptureTimer = 30000;
             } else GroundRuptureTimer -= diff;
 
             //ThrashTimer
             if (ThrashTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_THRASH);
+                DoCastVictim(SPELL_THRASH);
                 ThrashTimer = 10000;
             } else ThrashTimer -= diff;
 
             //HamstringTimer
             if (HamstringTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_HAMSTRING);
+                DoCastVictim(SPELL_HAMSTRING);
                 HamstringTimer = 10000;
             } else HamstringTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index 44352c7ef35..4b442604881 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -106,7 +106,7 @@ public:
             //MortalWound_Timer
             if (MortalWound_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_MORTAL_WOUND);
+                DoCastVictim(SPELL_MORTAL_WOUND);
                 MortalWound_Timer = urand(10000, 20000);
             } else MortalWound_Timer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index 206de40320f..5435de8c3ef 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -107,14 +107,14 @@ public:
             //Spit Timer
             if (Spit_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_ACIDSPIT);
+                DoCastVictim(SPELL_ACIDSPIT);
                 Spit_Timer = urand(5000, 10000);
             } else Spit_Timer -= diff;
 
             //NoxiousPoison_Timer
             if (NoxiousPoison_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_NOXIOUSPOISON);
+                DoCastVictim(SPELL_NOXIOUSPOISON);
                 NoxiousPoison_Timer = urand(12000, 24000);
             } else NoxiousPoison_Timer -= diff;
 
@@ -123,7 +123,7 @@ public:
             {
                 if (PoisonBolt_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_POISONBOLT);
+                    DoCastVictim(SPELL_POISONBOLT);
                     PoisonBolt_Timer = 3000;
                 } else PoisonBolt_Timer -= diff;
             }
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 84f35fdf9c0..d1cc2025be4 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -75,7 +75,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoCast(me->GetVictim(), SPELL_BIRTH);
+            DoCastVictim(SPELL_BIRTH);
         }
 
         void UpdateAI(uint32 diff)
@@ -87,14 +87,14 @@ public:
             //Sweep_Timer
             if (!Submerged && Sweep_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SWEEP);
+                DoCastVictim(SPELL_SWEEP);
                 Sweep_Timer = urand(15000, 30000);
             } else Sweep_Timer -= diff;
 
             //SandBlast_Timer
             if (!Submerged && SandBlast_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SANDBLAST);
+                DoCastVictim(SPELL_SANDBLAST);
                 SandBlast_Timer = urand(20000, 35000);
             } else SandBlast_Timer -= diff;
 
@@ -129,7 +129,7 @@ public:
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->setFaction(14);
 
-                DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE);
+                DoCastVictim(SPELL_GROUND_RUPTURE);
 
                 Submerged = false;
                 Submerge_Timer = urand(60000, 120000);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index d4b73a2e4a6..833ba83432b 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -441,7 +441,7 @@ public:
             //UnbalancingStrike_Timer
             if (UnbalancingStrike_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_UNBALANCING_STRIKE);
+                DoCastVictim(SPELL_UNBALANCING_STRIKE);
                 UnbalancingStrike_Timer = 8000+rand()%12000;
             } else UnbalancingStrike_Timer -= diff;
 
@@ -538,7 +538,7 @@ public:
                 if (!me->IsWithinDist(me->GetVictim(), 45.0f))
                     me->GetMotionMaster()->MoveChase(me->GetVictim(), VEKLOR_DIST, 0);
                 else
-                    DoCast(me->GetVictim(), SPELL_SHADOWBOLT);
+                    DoCastVictim(SPELL_SHADOWBOLT);
                 ShadowBolt_Timer = 2000;
             } else ShadowBolt_Timer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index fdbc40600a3..af76ea041a8 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -165,7 +165,7 @@ public:
 
             if (ShieldBash_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SHIELD_BASH);
+                DoCastVictim(SPELL_SHIELD_BASH);
                 ShieldBash_Timer = 15000;
             }
             else
@@ -173,7 +173,7 @@ public:
 
             if (Revenge_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_REVENGE);
+                DoCastVictim(SPELL_REVENGE);
                 Revenge_Timer = 10000;
             }
             else
@@ -338,7 +338,7 @@ public:
 
             if (Bomb_Timer < diff)
             {
-                DoCast(me->GetVictim(), SPELL_BOMB);
+                DoCastVictim(SPELL_BOMB);
                 Bomb_Timer = 10000;
             }
             else
@@ -346,7 +346,7 @@ public:
 
             if (me->isAttackReady() && !me->IsWithinMeleeRange(me->GetVictim()))
             {
-                DoCast(me->GetVictim(), SPELL_SHOOT);
+                DoCastVictim(SPELL_SHOOT);
                 me->SetSheath(SHEATH_STATE_RANGED);
             }
             else
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index 1cb7d5cfd37..4f70191810a 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -108,21 +108,21 @@ public:
             //        //MarkOfFrostTimer
             //        if (MarkOfFrostTimer <= diff)
             //        {
-            //            DoCast(me->GetVictim(), SPELL_MARKOFFROST);
+            //            DoCastVictim(SPELL_MARKOFFROST);
             //            MarkOfFrostTimer = 25000;
             //        } else MarkOfFrostTimer -= diff;
 
             //ChillTimer
             if (ChillTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CHILL);
+                DoCastVictim(SPELL_CHILL);
                 ChillTimer = urand(13000, 25000);
             } else ChillTimer -= diff;
 
             //BreathTimer
             if (BreathTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FROSTBREATH);
+                DoCastVictim(SPELL_FROSTBREATH);
                 BreathTimer = urand(10000, 15000);
             } else BreathTimer -= diff;
 
@@ -144,7 +144,7 @@ public:
             //CleaveTimer
             if (CleaveTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CLEAVE);
+                DoCastVictim(SPELL_CLEAVE);
                 CleaveTimer = 7000;
             } else CleaveTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 4d689d30508..315ee609bca 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -133,7 +133,7 @@ class npc_torek : public CreatureScript
 
                 if (Rend_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_REND);
+                    DoCastVictim(SPELL_REND);
                     Rend_Timer = 20000;
                 } else Rend_Timer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 86ea023349f..9d910fd4103 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -274,7 +274,7 @@ public:
 
             if (DynamiteTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_DYNAMITE);
+                DoCastVictim(SPELL_DYNAMITE);
                 DynamiteTimer = 8000;
             } else DynamiteTimer -= diff;
 
@@ -634,14 +634,14 @@ public:
 
             if (RendTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_REND);
+                DoCastVictim(SPELL_REND);
                 RendTimer = 30000;
             }
             else RendTimer -= diff;
 
             if (EnragingBiteTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_ENRAGING_BITE);
+                DoCastVictim(SPELL_ENRAGING_BITE);
                 EnragingBiteTimer = 15000;
             }
             else EnragingBiteTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index 7478b957c92..a497bc82abc 100644
--- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
@@ -231,13 +231,13 @@ public:
 
             if (ChainLightningTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING);
+                DoCastVictim(SPELL_CHAIN_LIGHTNING);
                 ChainLightningTimer = 9000;
             } else ChainLightningTimer -= diff;
 
             if (ShockTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_SHOCK);
+                DoCastVictim(SPELL_SHOCK);
                 ShockTimer = 15000;
             } else ShockTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
index e68e4ecc222..9159d56fc22 100644
--- a/src/server/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
@@ -132,7 +132,7 @@ public:
 
             if (FrostShockTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FROST_SHOCK);
+                DoCastVictim(SPELL_FROST_SHOCK);
                 FrostShockTimer = 15000;
             } else FrostShockTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
index b1dc9072d29..f7dd842070e 100644
--- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
@@ -112,25 +112,25 @@ public:
 
             if (UppercutTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_UPPERCUT);
+                DoCastVictim(SPELL_UPPERCUT);
                 UppercutTimer = 20000;
             } else UppercutTimer -= diff;
 
             if (ThunderclapTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_THUNDERCLAP);
+                DoCastVictim(SPELL_THUNDERCLAP);
                 ThunderclapTimer = 15000;
             } else ThunderclapTimer -= diff;
 
             if (MortalStrikeTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE);
+                DoCastVictim(SPELL_MORTAL_STRIKE);
                 MortalStrikeTimer = 15000;
             } else MortalStrikeTimer -= diff;
 
             if (CleaveTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_CLEAVE);
+                DoCastVictim(SPELL_CLEAVE);
                 CleaveTimer = 7000;
             } else CleaveTimer -= diff;
 
diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
index 9f2e1114ed8..221eed14afe 100644
--- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
@@ -134,7 +134,7 @@ public:
 
             if (DemoralizingShoutTimer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_DEMORALIZINGSHOUT);
+                DoCastVictim(SPELL_DEMORALIZINGSHOUT);
                 DemoralizingShoutTimer = 70000;
             } else DemoralizingShoutTimer -= diff;
         }