Core: Rename spell attributes, use more general names
--HG-- branch : trunk
This commit is contained in:
@@ -85,7 +85,7 @@ void WorldSession::HandlePetAction(WorldPacket & recv_data)
|
||||
SpellEntry const* spell = (flag == ACT_ENABLED || flag == ACT_PASSIVE) ? sSpellStore.LookupEntry(spellid) : NULL;
|
||||
if (!spell)
|
||||
return;
|
||||
if (!(spell->Attributes & SPELL_ATTR_CASTABLE_WHILE_DEAD))
|
||||
if (!(spell->Attributes & SPELL_ATTR0_CASTABLE_WHILE_DEAD))
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -424,8 +424,8 @@ void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket)
|
||||
if (!spellInfo)
|
||||
return;
|
||||
|
||||
// not allow remove non positive spells and spells with attr SPELL_ATTR_CANT_CANCEL
|
||||
if (!IsPositiveSpell(spellId) || (spellInfo->Attributes & SPELL_ATTR_CANT_CANCEL))
|
||||
// not allow remove non positive spells and spells with attr SPELL_ATTR0_CANT_CANCEL
|
||||
if (!IsPositiveSpell(spellId) || (spellInfo->Attributes & SPELL_ATTR0_CANT_CANCEL))
|
||||
return;
|
||||
|
||||
// don't allow cancelling passive auras (some of them are visible)
|
||||
|
||||
Reference in New Issue
Block a user