diff options
| author | QAston <none@none> | 2009-06-06 08:32:14 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-06-06 08:32:14 +0200 |
| commit | c99b74151727a081423c60d3f42f1bd6caf4cc7e (patch) | |
| tree | 61d45f78cdd770e10a81c32a7f938e725b72d78d /src/game/SpellMgr.cpp | |
| parent | 8bc46785de9950218f791f9eb6efc598d1a97d29 (diff) | |
| parent | 39548d6822ce2a8cea49e4467f8329335aa0d85d (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 99c113a5eb5..bed5ffc4d89 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -279,7 +279,7 @@ bool GetDispelChance(Unit* caster, uint32 spellId) return !roll_chance_i(miss_chance); } -uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell const* spell) +uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell * spell) { SpellCastTimesEntry const *spellCastTimeEntry = sSpellCastTimesStore.LookupEntry(spellInfo->CastingTimeIndex); @@ -1309,7 +1309,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr } // Always trigger for this - if (EventProcFlag & (PROC_FLAG_KILLED | PROC_FLAG_KILL | PROC_FLAG_ON_TRAP_ACTIVATION)) + if (procFlags & (PROC_FLAG_KILLED | PROC_FLAG_KILL | PROC_FLAG_ON_TRAP_ACTIVATION)) return true; if (spellProcEvent) // Exist event data { |