diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-22 23:55:33 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2018-01-22 23:55:33 -0300 |
| commit | c099174ff777d1bf5061f5cdc197ff17bd83fbb7 (patch) | |
| tree | c48689319a23398682db06558e3633759d79614f /src/server/scripts/Spells | |
| parent | 7c9722a4ae08b5f283f6a085a411e37604a7da9f (diff) | |
Core/Misc: fix some /W4 warnings and some reported by GCC 6.3
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warlock.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 8729fb4c889..238637a13f2 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1736,7 +1736,7 @@ class spell_dk_pestilence : public SpellScriptLoader float donePct = aurOld->GetDonePct(); float critChance = aurOld->GetCritChance(); - if (AuraEffect* aurEffOld = aurOld->GetEffect(EFFECT_0)) + if (aurOld->GetEffect(EFFECT_0)) { caster->CastSpell(hitUnit, SPELL_DK_BLOOD_PLAGUE, true); // Spread the disease to hitUnit. @@ -1754,7 +1754,7 @@ class spell_dk_pestilence : public SpellScriptLoader { float donePct = aurOld->GetDonePct(); - if (AuraEffect* aurEffOld = aurOld->GetEffect(EFFECT_0)) + if (aurOld->GetEffect(EFFECT_0)) { caster->CastSpell(hitUnit, SPELL_DK_FROST_FEVER, true); // Spread the disease to hitUnit. diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 4f5aa72c759..279553f87e9 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -830,7 +830,6 @@ class spell_warl_life_tap : public SpellScriptLoader if (AuraEffect const* aurEff = caster->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, WARLOCK_ICON_ID_IMPROVED_LIFE_TAP, 0)) AddPct(mana, aurEff->GetAmount()); - // @todo castspell refactor note: this is not triggered - intended? CastSpellExtraArgs args; args.AddSpellBP0(mana); caster->CastSpell(target, SPELL_WARLOCK_LIFE_TAP_ENERGIZE, args); @@ -843,9 +842,9 @@ class spell_warl_life_tap : public SpellScriptLoader if (manaFeedVal > 0) { ApplyPct(manaFeedVal, mana); - CastSpellExtraArgs args(TRIGGERED_FULL_MASK); - args.AddSpellBP0(manaFeedVal); - caster->CastSpell(caster, SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2, args); + CastSpellExtraArgs manaFeedArgs(TRIGGERED_FULL_MASK); + manaFeedArgs.AddSpellBP0(manaFeedVal); + caster->CastSpell(caster, SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2, manaFeedArgs); } } } |