From a22e4e121a1e54b2f4154d59623ee4a94a449176 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Jul 2015 00:33:36 +0200 Subject: Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler --- src/server/game/Spells/Spell.cpp | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 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 ae9fd1bee0d..b16d6893175 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1132,8 +1132,8 @@ void Spell::SelectImplicitNearbyTargets(SpellEffIndex effIndex, SpellImplicitTar { case TARGET_OBJECT_TYPE_UNIT: { - if (Unit* unitTarget = target->ToUnit()) - AddUnitTarget(unitTarget, effMask, true, false); + if (Unit* unit = target->ToUnit()) + AddUnitTarget(unit, effMask, true, false); else { TC_LOG_DEBUG("spells", "Spell::SelectImplicitNearbyTargets: OnObjectTargetSelect script hook for spell Id %u set object of wrong type, expected unit, got %s, effect %u", m_spellInfo->Id, target->GetGUID().GetTypeName(), effMask); @@ -1194,8 +1194,8 @@ void Spell::SelectImplicitConeTargets(SpellEffIndex effIndex, SpellImplicitTarge for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) { - if (Unit* unitTarget = (*itr)->ToUnit()) - AddUnitTarget(unitTarget, effMask, false); + if (Unit* unit = (*itr)->ToUnit()) + AddUnitTarget(unit, effMask, false); else if (GameObject* gObjTarget = (*itr)->ToGameObject()) AddGOTarget(gObjTarget, effMask); } @@ -1273,8 +1273,8 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) { - if (Unit* unitTarget = (*itr)->ToUnit()) - AddUnitTarget(unitTarget, effMask, false, true, center); + if (Unit* unit = (*itr)->ToUnit()) + AddUnitTarget(unit, effMask, false, true, center); else if (GameObject* gObjTarget = (*itr)->ToGameObject()) AddGOTarget(gObjTarget, effMask); } @@ -1545,8 +1545,8 @@ void Spell::SelectImplicitChainTargets(SpellEffIndex effIndex, SpellImplicitTarg CallScriptObjectAreaTargetSelectHandlers(targets, effIndex, targetType); for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) - if (Unit* unitTarget = (*itr)->ToUnit()) - AddUnitTarget(unitTarget, effMask, false); + if (Unit* unit = (*itr)->ToUnit()) + AddUnitTarget(unit, effMask, false); } } @@ -1601,12 +1601,12 @@ void Spell::SelectImplicitTrajTargets(SpellEffIndex effIndex) if (m_spellInfo->CheckTarget(m_caster, *itr, true) != SPELL_CAST_OK) continue; - if (Unit* unitTarget = (*itr)->ToUnit()) + if (Unit* unit = (*itr)->ToUnit()) { - if (m_caster == *itr || m_caster->IsOnVehicle(unitTarget) || unitTarget->GetVehicle()) + if (m_caster == *itr || m_caster->IsOnVehicle(unit) || unit->GetVehicle()) continue; - if (Creature* creatureTarget = unitTarget->ToCreature()) + if (Creature* creatureTarget = unit->ToCreature()) { if (!(creatureTarget->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PROJECTILE_COLLISION)) continue; @@ -1761,8 +1761,8 @@ void Spell::SelectEffectTypeImplicitTargets(uint32 effIndex) // player which not released his spirit is Unit, but target flag for it is TARGET_FLAG_CORPSE_MASK if (targetMask & (TARGET_FLAG_UNIT_MASK | TARGET_FLAG_CORPSE_MASK)) { - if (Unit* unitTarget = m_targets.GetUnitTarget()) - target = unitTarget; + if (Unit* unit = m_targets.GetUnitTarget()) + target = unit; else if (targetMask & TARGET_FLAG_CORPSE_MASK) { if (Corpse* corpseTarget = m_targets.GetCorpseTarget()) @@ -1777,8 +1777,8 @@ void Spell::SelectEffectTypeImplicitTargets(uint32 effIndex) } if (targetMask & TARGET_FLAG_ITEM_MASK) { - if (Item* itemTarget = m_targets.GetItemTarget()) - AddItemTarget(itemTarget, 1 << effIndex); + if (Item* item = m_targets.GetItemTarget()) + AddItemTarget(item, 1 << effIndex); return; } if (targetMask & TARGET_FLAG_GAMEOBJECT_MASK) @@ -1958,10 +1958,10 @@ void Spell::SearchChainTargets(std::list& targets, uint32 chainTar uint32 maxHPDeficit = 0; for (std::list::iterator itr = tempTargets.begin(); itr != tempTargets.end(); ++itr) { - if (Unit* unitTarget = (*itr)->ToUnit()) + if (Unit* unit = (*itr)->ToUnit()) { - uint32 deficit = unitTarget->GetMaxHealth() - unitTarget->GetHealth(); - if ((deficit > maxHPDeficit || foundItr == tempTargets.end()) && target->IsWithinDist(unitTarget, jumpRadius) && target->IsWithinLOSInMap(unitTarget)) + uint32 deficit = unit->GetMaxHealth() - unit->GetHealth(); + if ((deficit > maxHPDeficit || foundItr == tempTargets.end()) && target->IsWithinDist(unit, jumpRadius) && target->IsWithinLOSInMap(unit)) { foundItr = itr; maxHPDeficit = deficit; @@ -5101,12 +5101,12 @@ SpellCastResult Spell::CheckCast(bool strict) case SPELL_EFFECT_LEARN_PET_SPELL: { // check target only for unit target case - if (Unit* unitTarget = m_targets.GetUnitTarget()) + if (Unit* unit = m_targets.GetUnitTarget()) { if (m_caster->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_BAD_TARGETS; - Pet* pet = unitTarget->ToPet(); + Pet* pet = unit->ToPet(); if (!pet || pet->GetOwner() != m_caster) return SPELL_FAILED_BAD_TARGETS; @@ -5503,8 +5503,8 @@ SpellCastResult Spell::CheckCast(bool strict) if (target->GetOwner() && target->GetOwner()->GetTypeId() == TYPEID_PLAYER) return SPELL_FAILED_TARGET_IS_PLAYER_CONTROLLED; - int32 damage = CalculateDamage(effect->EffectIndex, target); - if (damage && int32(target->getLevel()) > damage) + int32 value = CalculateDamage(effect->EffectIndex, target); + if (value && int32(target->getLevel()) > value) return SPELL_FAILED_HIGHLEVEL; } @@ -6587,8 +6587,8 @@ bool Spell::CheckEffectTarget(Unit const* target, SpellEffectInfo const* effect, return false; if (!target->GetCharmerGUID().IsEmpty()) return false; - if (int32 damage = CalculateDamage(effect->EffectIndex, target)) - if ((int32)target->getLevel() > damage) + if (int32 value = CalculateDamage(effect->EffectIndex, target)) + if ((int32)target->getLevel() > value) return false; break; default: -- cgit v1.2.3