From ad56299846a92c2cda84ebcc2d37d9aa6e3e8024 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Mon, 25 Dec 2017 15:50:21 +0100 Subject: Core/Misc: Fix static analysis issues --- .../Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp | 3 +-- .../HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 48123c81778..71408b14ddb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -204,8 +204,7 @@ public: Submerged = false; WaitTimer2 = 500; } - - if (!Submerged && WaitTimer2 <= diff) // wait 500ms before emerge anim + else if (WaitTimer2 <= diff) // wait 500ms before emerge anim { me->RemoveAllAuras(); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 6da7007d42c..bcad390af06 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -204,8 +204,7 @@ class boss_omor_the_unscarred : public CreatureScript { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target) - target = me->GetVictim(); + target = me->GetVictim(); DoCast(target, SPELL_SHADOW_BOLT); Shadowbolt_Timer = 4000 + rand32() % 2500; -- cgit v1.2.3