Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Vincent-Michael
2013-08-15 16:49:58 +02:00
parent 0598f90dc0 4d260a54ae
commit 21fe779dfb
12 changed files with 91 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Spells/SpellInfo.cpp
View File

@@ -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;