diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-11-12 15:21:10 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-02-06 21:41:51 +0100 |
| commit | f5dcff32cbef6df60e88bd6f65fbda24852275e0 (patch) | |
| tree | 001b0200aaa0a18350c314c8a00f427a1d2b8195 | |
| parent | 852c9e910886da257069dd497afa1ed990b4e8dd (diff) | |
Core/Misc: Fix static analysis issues
(cherry picked from commit 06ea65b0e651be2b389800b5acf9a5e8b86d7444)
5 files changed, 6 insertions, 6 deletions
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); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index f3b22adb5b7..47f3f394044 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1191,7 +1191,7 @@ public: else if (unit->GetTypeId() == TYPEID_PLAYER) me->SetDisableGravity(true); } - else if (!apply) + else { if (unit->GetTypeId() != TYPEID_PLAYER) { @@ -1294,7 +1294,7 @@ public: if (unit->GetTypeId() == TYPEID_UNIT) unit->CastSpell(unit, SPELL_TELEPORT_VISUAL_ONLY); } - else if (!apply) + else { me->StopMoving(); me->SetDisableGravity(false); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 50010ead3d0..a0379900437 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -235,7 +235,7 @@ class instance_oculus : public InstanceMapScript return KILL_NO_CONSTRUCT; else if (CentrifugueConstructCounter == 1) return KILL_ONE_CONSTRUCT; - else if (CentrifugueConstructCounter > 1) + else return KILL_MORE_CONSTRUCT; } |