From 00a8a9ebb4ad2c832019eff3fd4da670ae244a9c Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Fri, 11 Jul 2014 21:50:49 +0200 Subject: Core: Fix warnings with other way --- src/server/game/Battlefield/Zones/BattlefieldWG.cpp | 9 ++++----- src/server/game/Groups/Group.cpp | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 55f74e44930..b16ac1e84de 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -682,11 +682,10 @@ void BattlefieldWG::PromotePlayer(Player* killer) { if (!m_isActive) return; - Aura* aur = NULL; // Updating rank of player - if (aur = killer->GetAura(SPELL_RECRUIT)) + if (Aura* auraRecruit = killer->GetAura(SPELL_RECRUIT)) { - if (aur->GetStackAmount() >= 5) + if (auraRecruit->GetStackAmount() >= 5) { killer->RemoveAura(SPELL_RECRUIT); killer->CastSpell(killer, SPELL_CORPORAL, true); @@ -695,9 +694,9 @@ void BattlefieldWG::PromotePlayer(Player* killer) else killer->CastSpell(killer, SPELL_RECRUIT, true); } - else if (aur = killer->GetAura(SPELL_CORPORAL)) + else if (Aura* auraCorporal = killer->GetAura(SPELL_CORPORAL)) { - if (aur->GetStackAmount() >= 5) + if (auraCorporal->GetStackAmount() >= 5) { killer->RemoveAura(SPELL_CORPORAL); killer->CastSpell(killer, SPELL_LIEUTENANT, true); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 45ecbf0c3df..00106d971ec 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -400,7 +400,6 @@ bool Group::AddMember(Player* player) stmt->setUInt8(4, member.roles); CharacterDatabase.Execute(stmt); - } SendUpdate(); -- cgit v1.2.3