From f5dcff32cbef6df60e88bd6f65fbda24852275e0 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 12 Nov 2017 15:21:10 +0100 Subject: Core/Misc: Fix static analysis issues (cherry picked from commit 06ea65b0e651be2b389800b5acf9a5e8b86d7444) --- .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp | 2 +- .../CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp | 2 +- src/server/scripts/Kalimdor/zone_the_barrens.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Kalimdor') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index b5e2568bdd2..8fa32166e6d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -1350,9 +1350,9 @@ public: if (!me->IsWithinDist(me->GetVictim(), 20) || forcemove) { - forcemove = false; if (forcemove) { + forcemove = false; if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->Attack(target, false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 6e9c88cb255..b24bd35821d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -156,7 +156,7 @@ public: m_auiEncounter[4] = NOT_STARTED; m_auiEncounter[5] = NOT_STARTED; } - else if (mThrallEventCount > 20) + else { m_auiEncounter[1] = data; m_auiEncounter[2] = data; diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 04520f7ed09..04549486b02 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -481,7 +481,7 @@ public: Talk(SAY_TWIGGY_FLATHEAD_OVER); Reset(); } - else if (creature) // Makes BIG WILL attackable. + else // Makes BIG WILL attackable. { creature->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); creature->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); -- cgit v1.2.3