aboutsummaryrefslogtreecommitdiff
path: root/src/game/BattleGround.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-08-08 16:18:05 +0200
committerQAston <none@none>2009-08-08 16:18:05 +0200
commit6b4772207fc4a6af1c9942d0057b9005aa38452e (patch)
tree84c2cdf2b9b44623e2e12839dd9f59502fb1c8c3 /src/game/BattleGround.cpp
parent08f1421ae187e43c3d5060f6a467d5b861159823 (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/BattleGround.cpp')
-rw-r--r--src/game/BattleGround.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 0135968b4be..709cac492d5 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -847,7 +847,7 @@ void BattleGround::RewardMark(Player *plr,uint32 count)
void BattleGround::RewardSpellCast(Player *plr, uint32 spell_id)
{
// 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
- if (plr->GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
+ if (plr->HasAura(SPELL_AURA_PLAYER_INACTIVE))
return;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
@@ -863,7 +863,7 @@ void BattleGround::RewardSpellCast(Player *plr, uint32 spell_id)
void BattleGround::RewardItem(Player *plr, uint32 item_id, uint32 count)
{
// 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
- if (plr->GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
+ if (plr->HasAura(SPELL_AURA_PLAYER_INACTIVE))
return;
ItemPosCountVec dest;