josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Rename spell attributes, use more general names

Browse Source 
--HG--
branch : trunk
This commit is contained in:
linencloth
2010-12-19 05:15:47 +01:00
parent 22928e23bd
commit 59da698189
22 changed files with 463 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellMgr.h
+25 -25
View File
@@ -309,17 +309,17 @@ inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto)
inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo)
{
return spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DEATH_PERSISTENT;
return spellInfo->AttributesEx3 & SPELL_ATTR3_DEATH_PERSISTENT;
}
inline bool IsRequiringDeadTargetSpell(SpellEntry const *spellInfo)
{
return spellInfo->AttributesEx3 & SPELL_ATTR_EX3_REQUIRE_DEAD_TARGET;
return spellInfo->AttributesEx3 & SPELL_ATTR3_REQUIRE_DEAD_TARGET;
}
inline bool IsAllowingDeadTargetSpell(SpellEntry const *spellInfo)
{
return spellInfo->AttributesEx2 & SPELL_ATTR_EX2_ALLOW_DEAD_TARGET;
return spellInfo->AttributesEx2 & SPELL_ATTR2_ALLOW_DEAD_TARGET;
}
inline bool IsDeadTargetSpell(SpellEntry const *spellInfo)
@@ -329,7 +329,7 @@ inline bool IsDeadTargetSpell(SpellEntry const *spellInfo)
inline bool IsNonCombatSpell(SpellEntry const *spellInfo)
{
return (spellInfo->Attributes & SPELL_ATTR_CANT_USED_IN_COMBAT) != 0;
return (spellInfo->Attributes & SPELL_ATTR0_CANT_USED_IN_COMBAT) != 0;
}
bool IsPositiveSpell(uint32 spellId);
@@ -468,12 +468,12 @@ inline bool IsDispelSpell(SpellEntry const *spellInfo)
inline bool isSpellBreakStealth(SpellEntry const* spellInfo)
{
return !(spellInfo->AttributesEx & SPELL_ATTR_EX_NOT_BREAK_STEALTH);
return !(spellInfo->AttributesEx & SPELL_ATTR1_NOT_BREAK_STEALTH);
}
inline bool IsAutoRepeatRangedSpell(SpellEntry const* spellInfo)
{
return spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG;
return spellInfo->AttributesEx2 & SPELL_ATTR2_AUTOREPEAT_FLAG;
}
inline bool IsRangedWeaponSpell(SpellEntry const* spellInfo)
@@ -487,12 +487,12 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
inline bool IsChanneledSpell(SpellEntry const* spellInfo)
{
return (spellInfo->AttributesEx & (SPELL_ATTR_EX_CHANNELED_1 | SPELL_ATTR_EX_CHANNELED_2));
return (spellInfo->AttributesEx & (SPELL_ATTR1_CHANNELED_1 | SPELL_ATTR1_CHANNELED_2));
}
inline bool NeedsComboPoints(SpellEntry const* spellInfo)
{
return (spellInfo->AttributesEx & (SPELL_ATTR_EX_REQ_COMBO_POINTS1 | SPELL_ATTR_EX_REQ_COMBO_POINTS2));
return (spellInfo->AttributesEx & (SPELL_ATTR1_REQ_COMBO_POINTS1 | SPELL_ATTR1_REQ_COMBO_POINTS2));
}
inline SpellSchoolMask GetSpellSchoolMask(SpellEntry const* spellInfo)
@@ -876,23 +876,23 @@ inline bool IsProfessionSkill(uint32 skill)
return IsPrimaryProfessionSkill(skill) || skill == SKILL_FISHING || skill == SKILL_COOKING || skill == SKILL_FIRST_AID;
}
#define SPELL_ATTR_CU_CONE_BACK 0x00000002
#define SPELL_ATTR_CU_CONE_LINE 0x00000004
#define SPELL_ATTR_CU_SHARE_DAMAGE 0x00000008
#define SPELL_ATTR_CU_AURA_CC 0x00000040
#define SPELL_ATTR_CU_DIRECT_DAMAGE 0x00000100
#define SPELL_ATTR_CU_CHARGE 0x00000200
#define SPELL_ATTR_CU_LINK_CAST 0x00000400
#define SPELL_ATTR_CU_LINK_HIT 0x00000800
#define SPELL_ATTR_CU_LINK_AURA 0x00001000
#define SPELL_ATTR_CU_LINK_REMOVE 0x00002000
#define SPELL_ATTR_CU_PICKPOCKET 0x00004000
#define SPELL_ATTR_CU_EXCLUDE_SELF 0x00008000
#define SPELL_ATTR_CU_NEGATIVE_EFF0 0x00010000
#define SPELL_ATTR_CU_NEGATIVE_EFF1 0x00020000
#define SPELL_ATTR_CU_NEGATIVE_EFF2 0x00040000
#define SPELL_ATTR_CU_NEGATIVE 0x00070000
#define SPELL_ATTR_CU_IGNORE_ARMOR 0x00080000
#define SPELL_ATTR0_CU_CONE_BACK 0x00000002
#define SPELL_ATTR0_CU_CONE_LINE 0x00000004
#define SPELL_ATTR0_CU_SHARE_DAMAGE 0x00000008
#define SPELL_ATTR0_CU_AURA_CC 0x00000040
#define SPELL_ATTR0_CU_DIRECT_DAMAGE 0x00000100
#define SPELL_ATTR0_CU_CHARGE 0x00000200
#define SPELL_ATTR0_CU_LINK_CAST 0x00000400
#define SPELL_ATTR0_CU_LINK_HIT 0x00000800
#define SPELL_ATTR0_CU_LINK_AURA 0x00001000
#define SPELL_ATTR0_CU_LINK_REMOVE 0x00002000
#define SPELL_ATTR0_CU_PICKPOCKET 0x00004000
#define SPELL_ATTR0_CU_EXCLUDE_SELF 0x00008000
#define SPELL_ATTR0_CU_NEGATIVE_EFF0 0x00010000
#define SPELL_ATTR0_CU_NEGATIVE_EFF1 0x00020000
#define SPELL_ATTR0_CU_NEGATIVE_EFF2 0x00040000
#define SPELL_ATTR0_CU_NEGATIVE 0x00070000
#define SPELL_ATTR0_CU_IGNORE_ARMOR 0x00080000
typedef std::vector<uint32> SpellCustomAttribute;
typedef std::vector<bool> EnchantCustomAttribute;