diff options
author | QAston <none@none> | 2009-08-08 16:18:05 +0200 |
---|---|---|
committer | QAston <none@none> | 2009-08-08 16:18:05 +0200 |
commit | 6b4772207fc4a6af1c9942d0057b9005aa38452e (patch) | |
tree | 84c2cdf2b9b44623e2e12839dd9f59502fb1c8c3 /src/game/Spell.cpp | |
parent | 08f1421ae187e43c3d5060f6a467d5b861159823 (diff) |
*Cleanups, remove obsolete code and minor optimizations in spellauras.cpp and spelleffects.cpp
*Remove GetDummyAura(uint32 spellid) function - it is faster to use GetAuraEffect or GetAura if id is known than iterate threw dummy auras list
*Move Death Strike code from HandleDummyAuraProc to Spell::EffectDummy - original patch by hununza.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r-- | src/game/Spell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 9b45eac6b2d..2a2a89399c7 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -3594,7 +3594,7 @@ void Spell::WriteAmmoToPacket( WorldPacket * data ) ammoInventoryType = pProto->InventoryType; } } - else if(m_caster->GetDummyAura(46699)) // Requires No Ammo + else if(m_caster->HasAura(46699)) // Requires No Ammo { ammoDisplayID = 5996; // normal arrow ammoInventoryType = INVTYPE_AMMO; @@ -5820,7 +5820,7 @@ SpellCastResult Spell::CheckItems() if(!ammo) { // Requires No Ammo - if(m_caster->GetDummyAura(46699)) + if(m_caster->HasAura(46699)) break; // skip other checks return SPELL_FAILED_NO_AMMO; |