aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellAuras.cpp
diff options
context:
space:
mode:
authorSpp <none@none>2010-04-29 23:12:16 +0200
committerSpp <none@none>2010-04-29 23:12:16 +0200
commitcb0cb962831a2b0c62b0a67b750569ca3049327e (patch)
treef5638fb8695101002f77106da4264bbeaab46938 /src/game/SpellAuras.cpp
parent35af94d4b57d234bc4d6e3c8ab67acb201500bae (diff)
Warning Fixes
Code Style cleanup Fix linux compile --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
-rw-r--r--src/game/SpellAuras.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 901adfd2443..1017e7d26d3 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -558,8 +558,13 @@ void Aura::UpdateOwner(uint32 diff, WorldObject * owner)
Player * modOwner = NULL;
if (caster)
{
- if ((modOwner = caster->GetSpellModOwner()) && (modSpell = modOwner->FindCurrentSpellBySpellId(GetId())))
- modOwner->SetSpellModTakingSpell(modSpell, true);
+ modOwner = caster->GetSpellModOwner();
+ if (modOwner)
+ {
+ modSpell = modOwner->FindCurrentSpellBySpellId(GetId());
+ if (modSpell)
+ modOwner->SetSpellModTakingSpell(modSpell, true);
+ }
}
Update(diff, caster);