From e6185c92fc224e5427e634fdb1d44565a0fcf269 Mon Sep 17 00:00:00 2001
From: Vincent-Michael <Vincent_Michael@gmx.de>
Date: Sat, 22 Jun 2013 16:53:13 +0200
Subject: Scripts: Convert DoCast(me->GetVictim(), SPELL_XXXXX); in
 DoCastVictim(SPELL_XXX);

---
 src/server/scripts/World/boss_emerald_dragons.cpp |  2 +-
 src/server/scripts/World/guards.cpp               |  4 ++--
 src/server/scripts/World/npcs_special.cpp         | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/server/scripts/World')

diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index 9c12be9c916..663127e8cf3 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -593,7 +593,7 @@ class boss_taerar : public CreatureScript
 
                     uint32 count = sizeof(TaerarShadeSpells) / sizeof(uint32);
                     for (uint32 i = 0; i < count; ++i)
-                        DoCast(me->GetVictim(), TaerarShadeSpells[i], true);
+                        DoCastVictim(TaerarShadeSpells[i], true);
                     _shades += count;
 
                     DoCast(SPELL_SHADE);
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index 8c477c38c2b..32b362c47c2 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -131,7 +131,7 @@ public:
                         if (healing)
                             DoCast(me, info->Id);
                         else
-                            DoCast(me->GetVictim(), info->Id);
+                            DoCastVictim(info->Id);
 
                         //Set our global cooldown
                         globalCooldown = GENERIC_CREATURE_COOLDOWN;
@@ -174,7 +174,7 @@ public:
                         if (healing)
                             DoCast(me, info->Id);
                         else
-                            DoCast(me->GetVictim(), info->Id);
+                            DoCastVictim(info->Id);
 
                         //Set our global cooldown
                         globalCooldown = GENERIC_CREATURE_COOLDOWN;
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 8a1b5e8b146..28b6c5faaff 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1136,7 +1136,7 @@ public:
 
             if (me->isAttackReady())
             {
-                DoCast(me->GetVictim(), SPELL_DEATHTOUCH, true);
+                DoCastVictim(SPELL_DEATHTOUCH, true);
                 me->resetAttackTimer();
             }
         }
@@ -1680,7 +1680,7 @@ public:
                         else
                             spell = SPELL_CRIPPLING_POISON;
 
-                        DoCast(me->GetVictim(), spell);
+                        DoCastVictim(spell);
                     }
 
                     SpellTimer = VIPER_TIMER;
@@ -1688,7 +1688,7 @@ public:
                 else //Venomous Snake
                 {
                     if (urand(0, 2) == 0) //33% chance to cast
-                        DoCast(me->GetVictim(), SPELL_DEADLY_POISON);
+                        DoCastVictim(SPELL_DEADLY_POISON);
                     SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() % 5) * 100;
                 }
             }
@@ -2122,7 +2122,7 @@ public:
 
             if (FireShield_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FIRESHIELD);
+                DoCastVictim(SPELL_FIRESHIELD);
                 FireShield_Timer = 2 * IN_MILLISECONDS;
             }
             else
@@ -2130,7 +2130,7 @@ public:
 
             if (FireBlast_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FIREBLAST);
+                DoCastVictim(SPELL_FIREBLAST);
                 FireBlast_Timer = 5000 + rand() % 15000; // 5-20 sec cd
             }
             else
@@ -2138,7 +2138,7 @@ public:
 
             if (FireNova_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_FIRENOVA);
+                DoCastVictim(SPELL_FIRENOVA);
                 FireNova_Timer = 5000 + rand() % 15000; // 5-20 sec cd
             }
             else
@@ -2183,7 +2183,7 @@ public:
 
             if (AngeredEarth_Timer <= diff)
             {
-                DoCast(me->GetVictim(), SPELL_ANGEREDEARTH);
+                DoCastVictim(SPELL_ANGEREDEARTH);
                 AngeredEarth_Timer = 5000 + rand() % 15000; // 5-20 sec cd
             }
             else
-- 
cgit v1.2.3