diff options
| author | megamage <none@none> | 2009-06-15 23:38:57 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-15 23:38:57 -0500 |
| commit | 74e4f3f0592ee2800a1bd4f3000b5429d7bb865f (patch) | |
| tree | 02de772aa71df0922f7fca83519b58f13298879d /src/game/Unit.cpp | |
| parent | cc527c884e9f643cadfd7ef186fbd419103c867b (diff) | |
| parent | c7c092f54bc6aa988991c601d532322c5cb8df32 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 190aea1b923..75ee0e3784d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1271,7 +1271,7 @@ uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage return damageInfo.damage; } -void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType) +void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType, bool crit) { if (damage < 0) return; @@ -1283,7 +1283,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama SpellSchoolMask damageSchoolMask = SpellSchoolMask(damageInfo->schoolMask); uint32 crTypeMask = pVictim->GetCreatureTypeMask(); // Check spell crit chance - bool crit = isSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType); + //bool crit = isSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType); bool blocked = false; // Per-school calc switch (spellInfo->DmgClass) |