diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-07-31 11:55:00 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-07-31 11:55:00 +0200 |
| commit | 197d4369c894e9b088f862c7189f4fe20b4836ca (patch) | |
| tree | e09203a72e664327b567bb039e84e9e2ac6f780e /src/server/game/Spells/SpellInfo.cpp | |
| parent | 4c29e456206424052c0e8df4321eae73aec18086 (diff) | |
Core/Spells: Removed old combo point code leftovers
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index b0cef2841d6..1c08ed30c7f 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -526,7 +526,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32 } else if (GetScalingExpectedStat() == ExpectedStatType::None) { - if (casterUnit && basePointsPerLevel != 0.0f) + if (casterUnit && basePointsPerLevel != 0.0) { int32 level = int32(casterUnit->GetLevel()); if (level > int32(_spellInfo->MaxLevel) && _spellInfo->MaxLevel > 0) @@ -545,7 +545,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32 { // bonus amount from combo points if (comboDamage) - if (uint32 comboPoints = casterUnit->GetComboPoints()) + if (int32 comboPoints = casterUnit->GetPower(POWER_COMBO_POINTS)) value += comboDamage * comboPoints; } @@ -1710,11 +1710,6 @@ bool SpellInfo::IsMoveAllowedChannel() const return IsChanneled() && !ChannelInterruptFlags.HasFlag(SpellAuraInterruptFlags::Moving | SpellAuraInterruptFlags::Turning); } -bool SpellInfo::NeedsComboPoints() const -{ - return HasAttribute(SpellAttr1(SPELL_ATTR1_FINISHING_MOVE_DAMAGE | SPELL_ATTR1_FINISHING_MOVE_DURATION)); -} - bool SpellInfo::IsNextMeleeSwingSpell() const { return HasAttribute(SpellAttr0(SPELL_ATTR0_ON_NEXT_SWING_NO_DAMAGE | SPELL_ATTR0_ON_NEXT_SWING)); |