From 21cad4609760ee8c648611af53d2abec1fc4ce8a Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 12 Nov 2017 15:21:10 +0100 Subject: [PATCH] Core/Misc: Fix static analysis issues --- .../CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp | 2 +- .../EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp | 2 +- src/server/scripts/Kalimdor/zone_the_barrens.cpp | 2 +- .../scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 4 ++-- src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp | 2 +- 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 7b05567b17..a0744b992f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -1343,9 +1343,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 5e4c9c0ed0..a90769b4a4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -165,7 +165,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 de6d440af2..5d20090a6c 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -486,7 +486,7 @@ public: Talk(SAY_TWIGGY_FLATHEAD_OVER); Reset(); } - else if (creature) // Makes BIG WILL attackable. + else // Makes BIG WILL attackable. { creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, 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 0e64a02f0d..5a0177cf03 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1182,7 +1182,7 @@ public: else if (unit->GetTypeId() == TYPEID_PLAYER) me->SetDisableGravity(true); } - else if (!apply) + else { if (unit->GetTypeId() != TYPEID_PLAYER) { @@ -1285,7 +1285,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 dbb177b4c7..647f2ffc71 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -237,7 +237,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; }