diff options
| author | megamage <none@none> | 2009-05-26 15:32:11 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-26 15:32:11 -0500 |
| commit | 326940181ad63d2336d2a91214d9a9c930fb481d (patch) | |
| tree | df5cedb20ec13d656f972551d7463dadba9e740a /src | |
| parent | 18252e5f796265c6e04b759d61e0af9f375d5188 (diff) | |
*Consider flight spells as passive spells.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Player.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8b41206928e..d5fc690bb92 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16909,7 +16909,7 @@ void Player::VehicleSpellInitialize() if(!spellInfo) continue; - if(IsPassiveSpell(spellId) || spellInfo->activeIconID == 2158) //flight + if(IsPassiveSpell(spellId)) { charm->CastSpell(charm, spellId, true); data << uint16(0) << uint8(0) << uint8(i+8); diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 7e16b325290..89756a3695d 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -303,7 +303,11 @@ bool IsPassiveSpell(uint32 spellId) SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); if (!spellInfo) return false; - return (spellInfo->Attributes & SPELL_ATTR_PASSIVE) != 0; + if(spellInfo->Attributes & SPELL_ATTR_PASSIVE) + return true; + if(spellInfo->activeIconID == 2158) //flight + return true; + return false; } bool IsAutocastableSpell(uint32 spellId) @@ -313,6 +317,8 @@ bool IsAutocastableSpell(uint32 spellId) return false; if(spellInfo->Attributes & SPELL_ATTR_PASSIVE) return false; + if(spellInfo->activeIconID == 2158) + return false; if(spellInfo->AttributesEx & SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET) return false; return true; |