From 8244d608593f2ebcd5441fcfdfe438c9b7fdb83a 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 (cherry picked from commit ad56299846a92c2cda84ebcc2d37d9aa6e3e8024) --- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/scripts/Northrend/zone_borean_tundra.cpp | 1 - .../Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp | 3 +-- .../HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 0fbb9ceaa6b..71005da4166 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17432,7 +17432,7 @@ bool Player::HasQuestForItem(uint32 itemid) const // examined item is a source item if (qInfo->ItemDrop[j] == itemid) { - ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid); + ItemTemplate const* pProto = ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(itemid)); // 'unique' item if (pProto->GetMaxCount() && GetItemCount(itemid, true) < pProto->GetMaxCount()) diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 0be916f8aba..cccc2841f85 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -2306,7 +2306,6 @@ public: charGossipItem = GOSSIP_ITEM_GUARD_MITCHELLS; break; default: - charGossipItem = ""; return false; } 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 592d2fbbaa2..44fbabf16e1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -202,8 +202,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->SetEmoteState(EMOTE_ONESHOT_NONE); 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 e123ed634cf..34f3d9c18f9 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 @@ -203,8 +203,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