From c099174ff777d1bf5061f5cdc197ff17bd83fbb7 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 22 Jan 2018 23:55:33 -0300 Subject: Core/Misc: fix some /W4 warnings and some reported by GCC 6.3 --- src/server/game/Spells/Spell.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 2173d681f51..8e295028d34 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3151,11 +3151,11 @@ void Spell::_cast(bool skipCheck) // Let any pets know we've attacked something. Check DmgClass for harmful spells only // This prevents spells such as Hunter's Mark from triggering pet attack if (GetSpellInfo()->DmgClass != SPELL_DAMAGE_CLASS_NONE) - if (Unit* unitTarget = m_targets.GetUnitTarget()) + if (Unit* target = m_targets.GetUnitTarget()) for (Unit* controlled : playerCaster->m_Controlled) if (Creature* cControlled = controlled->ToCreature()) if (cControlled->IsAIEnabled) - cControlled->AI()->OwnerAttacked(unitTarget); + cControlled->AI()->OwnerAttacked(target); } SetExecutedCurrently(true); @@ -3228,7 +3228,7 @@ void Spell::_cast(bool skipCheck) if (aura_effmask) { bool const triggered = m_triggeredByAuraSpell != nullptr; - if (DiminishingGroup diminishGroup = m_spellInfo->GetDiminishingReturnsGroupForSpell(triggered)) + if (m_spellInfo->GetDiminishingReturnsGroupForSpell(triggered)) { DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(triggered); if (type == DRTYPE_ALL || (type == DRTYPE_PLAYER && target->IsAffectedByDiminishingReturns())) @@ -5576,7 +5576,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!m_targets.GetUnitTarget() || m_targets.GetUnitTarget() == m_caster) return SPELL_FAILED_BAD_TARGETS; - uint32 dispelMask = SpellInfo::GetDispelMask(DispelType(m_spellInfo->Effects[i].MiscValue)); + dispelMask = SpellInfo::GetDispelMask(DispelType(m_spellInfo->Effects[i].MiscValue)); bool hasStealableAura = false; Unit::VisibleAuraMap const* visibleAuras = m_targets.GetUnitTarget()->GetVisibleAuras(); for (Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr) -- cgit v1.2.3