diff options
| author | megamage <none@none> | 2008-12-23 15:51:07 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-12-23 15:51:07 -0600 |
| commit | 7fe4b221db3689989ac091ae60b64f6384a2c3cb (patch) | |
| tree | 50baf2dfecb0fdf2ae9b22025d6d5dd0970953be /src/game/Unit.cpp | |
| parent | c230fb2c28a51b9033e4494d8aade3e7eedf09cf (diff) | |
*Calculate spell points when casting but not hitting.
--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 1603c458932..2a0787fb31e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10454,7 +10454,7 @@ bool Unit::SelectHostilTarget() //====================================================================== //====================================================================== -int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_index, int32 effBasePoints, Unit const* target) +int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_index, int32 effBasePoints, Unit const* /*target*/) { Player* unitPlayer = (GetTypeId() == TYPEID_PLAYER) ? (Player*)this : NULL; @@ -10477,7 +10477,7 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_inde int32 randvalue = spellProto->EffectBaseDice[effect_index] >= randomPoints ? spellProto->EffectBaseDice[effect_index]:irand(spellProto->EffectBaseDice[effect_index], randomPoints); int32 value = basePoints + randvalue; //random damage - if(comboDamage != 0 && unitPlayer && target && (target->GetGUID() == unitPlayer->GetComboTarget())) + if(comboDamage != 0 && unitPlayer /*&& target && (target->GetGUID() == unitPlayer->GetComboTarget())*/) value += (int32)(comboDamage * comboPoints); if(Player* modOwner = GetSpellModOwner()) |