From 59da698189cccb65b94f7b14690ce87ef226cef7 Mon Sep 17 00:00:00 2001 From: linencloth Date: Sun, 19 Dec 2010 05:15:47 +0100 Subject: Core: Rename spell attributes, use more general names --HG-- branch : trunk --- src/server/game/Server/Protocol/Handlers/PetHandler.cpp | 2 +- src/server/game/Server/Protocol/Handlers/SpellHandler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Server/Protocol') diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 82bf2e10f2f..4d54bb6981a 100755 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -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; } diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp index 1e40b48e23e..eccd40e3379 100755 --- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp @@ -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) -- cgit v1.2.3