diff options
| author | linencloth <none@none> | 2010-12-19 05:15:47 +0100 |
|---|---|---|
| committer | linencloth <none@none> | 2010-12-19 05:15:47 +0100 |
| commit | 59da698189cccb65b94f7b14690ce87ef226cef7 (patch) | |
| tree | c3fcb0a008e964c619d3b275caffa1765b369262 /src/server/game/Entities/Player | |
| parent | 22928e23bd94cb744d2593996fad2de72a8eaece (diff) | |
Core: Rename spell attributes, use more general names
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Entities/Player')
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 13b8f2229f3..2a2d1133386 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3601,7 +3601,7 @@ bool Player::IsNeedCastPassiveSpellAtLearn(SpellEntry const* spellInfo) const // talent dependent passives activated at form apply have proper stance data ShapeshiftForm form = GetShapeshiftForm(); bool need_cast = (!spellInfo->Stances || (form && (spellInfo->Stances & (1 << (form - 1)))) || - (!form && (spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT))); + (!form && (spellInfo->AttributesEx2 & SPELL_ATTR2_NOT_NEED_SHAPESHIFT))); //Check CasterAuraStates return need_cast && (!spellInfo->CasterAuraState || HasAuraState(AuraState(spellInfo->CasterAuraState))); @@ -6518,7 +6518,7 @@ void Player::CheckAreaExploreAndOutdoor() uint16 areaFlag = GetBaseMap()->GetAreaFlag(GetPositionX(),GetPositionY(),GetPositionZ(), &isOutdoor); if (sWorld.getBoolConfig(CONFIG_VMAP_INDOOR_CHECK) && !isOutdoor) - RemoveAurasWithAttribute(SPELL_ATTR_OUTDOORS_ONLY); + RemoveAurasWithAttribute(SPELL_ATTR0_OUTDOORS_ONLY); if (areaFlag==0xffff) return; @@ -19747,7 +19747,7 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs) } // Not send cooldown for this spells - if (spellInfo->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE) + if (spellInfo->Attributes & SPELL_ATTR0_DISABLED_WHILE_ACTIVE) continue; if (spellInfo->PreventionType != SPELL_PREVENTION_TYPE_SILENCE) @@ -21725,8 +21725,8 @@ bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item cons bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const { - // don't take reagents for spells with SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP - if (spellInfo->AttributesEx5 & SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP && + // don't take reagents for spells with SPELL_ATTR5_NO_REAGENT_WHILE_PREP + if (spellInfo->AttributesEx5 & SPELL_ATTR5_NO_REAGENT_WHILE_PREP && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION)) return true; @@ -22671,7 +22671,7 @@ void Player::AddGlobalCooldown(SpellEntry const *spellInfo, Spell *spell) float cdTime = float(spellInfo->StartRecoveryTime); - if (!(spellInfo->Attributes & (SPELL_ATTR_UNK4|SPELL_ATTR_PASSIVE))) + if (!(spellInfo->Attributes & (SPELL_ATTR0_UNK4|SPELL_ATTR0_PASSIVE))) cdTime *= GetFloatValue(UNIT_MOD_CAST_SPEED); else if (IsRangedWeaponSpell(spellInfo) && !spell->IsAutoRepeat()) cdTime *= m_modAttackSpeedPct[RANGED_ATTACK]; |