From ae917e950bbf5e31cbf3c6c537bd34ba4ef883ad Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Tue, 14 Nov 2017 11:23:25 +0000 Subject: Scripts: Fix static analysis issues CID 1381648, 1379869, 1377302 and… (#20748) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Scripts: Fix static analysis issues CID 1381648, 1379869, 1377302 and 1377300 --- src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp | 5 +++-- src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index fc90699307b..09a7fdc1d4f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -589,8 +589,9 @@ class spell_marrowgar_coldflame_damage : public SpellScriptLoader if (target->HasAura(SPELL_IMPALED)) return false; - if (target->GetExactDist2d(GetOwner()) > GetSpellInfo()->GetEffect(target->GetMap()->GetDifficultyID(), EFFECT_0)->CalcRadius()) - return false; + if (SpellEffectInfo const* effect = GetSpellInfo()->GetEffect(target->GetMap()->GetDifficultyID(), EFFECT_0)) + if (target->GetExactDist2d(GetOwner()) > effect->CalcRadius()) + return false; if (Aura* aur = target->GetAura(GetId())) if (aur->GetOwner() != GetOwner()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 6d29fe8a46d..f9af80eaca1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1549,7 +1549,8 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader PreventDefaultAction(); if (Unit* caster = GetCaster()) { - caster->AddThreat(GetTarget(), -float(GetSpellInfo()->GetEffect(caster->GetMap()->GetDifficultyID(), EFFECT_1)->CalcValue())); + if (SpellEffectInfo const* effect = GetSpellInfo()->GetEffect(caster->GetMap()->GetDifficultyID(), EFFECT_1)) + caster->AddThreat(GetTarget(), -float(effect->CalcValue())); caster->GetAI()->SetData(DATA_WHELP_MARKER, 0); } } -- cgit v1.2.3