diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-15 16:49:58 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-15 16:49:58 +0200 |
| commit | 21fe779dfbd7bf6dba5cb7db2be268f1405f98bc (patch) | |
| tree | 8bb9db21632f07f745833a4a703e3c0a674c7b3e /src/server/game/Spells/SpellInfo.cpp | |
| parent | 0598f90dc002779fe2ae30c133434d7a1c6b9176 (diff) | |
| parent | 4d260a54aebbdabdb9982e297d1e5086f8a68fa9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 52d4e5487ee..c48f6f8be20 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -2238,7 +2238,7 @@ int32 SpellInfo::GetMaxDuration() const return (DurationEntry->Duration[2] == -1) ? -1 : abs(DurationEntry->Duration[2]); } -uint32 SpellInfo::CalcCastTime(Unit* caster, Spell* spell) const +uint32 SpellInfo::CalcCastTime(Spell* spell /*= NULL*/) const { int32 castTime = 0; @@ -2255,8 +2255,8 @@ uint32 SpellInfo::CalcCastTime(Unit* caster, Spell* spell) const if (!castTime) return 0; - if (caster) - caster->ModSpellCastTime(this, castTime, spell); + if (spell) + spell->GetCaster()->ModSpellCastTime(this, castTime, spell); if (Attributes & SPELL_ATTR0_REQ_AMMO && (!IsAutoRepeatRangedSpell()) && !(AttributesEx9 & SPELL_ATTR9_AIMED_SHOT)) castTime += 500; |