diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-06-23 14:51:52 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-06-23 14:51:52 +0200 |
| commit | 3f3a32df3498368be953c3f0fbcfabe6aa6f28f9 (patch) | |
| tree | 33425be0cc4338bbae28bc79236ac0237a8d5bb1 /src/server/scripts/World | |
| parent | 6cbced8e1665415f42de3f46164121fe26bbb984 (diff) | |
| parent | 89466f76acd9fc8562f80d5c6df75eac84bfdae2 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/boss_emerald_dragons.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/World/guards.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 14 |
3 files changed, 10 insertions, 10 deletions
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 e810e6f39bf..1034402c7b7 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1130,7 +1130,7 @@ public: if (me->isAttackReady()) { - DoCast(me->GetVictim(), SPELL_DEATHTOUCH, true); + DoCastVictim(SPELL_DEATHTOUCH, true); me->resetAttackTimer(); } } @@ -1674,7 +1674,7 @@ public: else spell = SPELL_CRIPPLING_POISON; - DoCast(me->GetVictim(), spell); + DoCastVictim(spell); } SpellTimer = VIPER_TIMER; @@ -1682,7 +1682,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; } } @@ -2116,7 +2116,7 @@ public: if (FireShield_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_FIRESHIELD); + DoCastVictim(SPELL_FIRESHIELD); FireShield_Timer = 2 * IN_MILLISECONDS; } else @@ -2124,7 +2124,7 @@ public: if (FireBlast_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_FIREBLAST); + DoCastVictim(SPELL_FIREBLAST); FireBlast_Timer = 5000 + rand() % 15000; // 5-20 sec cd } else @@ -2132,7 +2132,7 @@ public: if (FireNova_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_FIRENOVA); + DoCastVictim(SPELL_FIRENOVA); FireNova_Timer = 5000 + rand() % 15000; // 5-20 sec cd } else @@ -2177,7 +2177,7 @@ public: if (AngeredEarth_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_ANGEREDEARTH); + DoCastVictim(SPELL_ANGEREDEARTH); AngeredEarth_Timer = 5000 + rand() % 15000; // 5-20 sec cd } else |