diff options
| author | Paradox <iamparadox@netscape.net> | 2009-12-19 23:42:19 -0500 |
|---|---|---|
| committer | Paradox <iamparadox@netscape.net> | 2009-12-19 23:42:19 -0500 |
| commit | a21f0da24fe99becc06eb2a08016d7acb4d82027 (patch) | |
| tree | b7b481cee90d7917a32b5670c5278a6311f96513 /src/game | |
| parent | 9218ebce9d97b2b27397aa98d28fac9e43584949 (diff) | |
fix CRLF in last 3-4 commits, take note, new devs using windows need to configure the win32text extension properly before pushing anything else.
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/SpellEffects.cpp | 14 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 5bff50196ce..adf82f3289f 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -437,13 +437,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); // Shield Slam else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) - {
- damage += int32(m_caster->GetShieldBlockValue());
-
- // Glyph of Shield Slam
- if (m_caster->HasAura(58375))
- m_caster->CastSpell(m_caster, 58374, true);
- }
+ { + damage += int32(m_caster->GetShieldBlockValue()); + + // Glyph of Shield Slam + if (m_caster->HasAura(58375)) + m_caster->CastSpell(m_caster, 58374, true); + } // Victory Rush else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index ae694ffbdbf..36c7cf23e22 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10270,9 +10270,9 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint TakenTotalMod *= (HealingWay->GetAmount() + 100.0f) / 100.0f; } - // Tenacity increase healing % taken
- if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0))
- TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f;
+ // Tenacity increase healing % taken + if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0)) + TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f; // Healing taken percent |