diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-11-12 15:21:10 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-11-12 15:46:56 +0100 |
| commit | 06ea65b0e651be2b389800b5acf9a5e8b86d7444 (patch) | |
| tree | 7ce6c116afc4fe3d30ba9dcffc9a1de4b4c28532 /src/server/scripts/Kalimdor | |
| parent | a80c95a1c788932696fb43e69b9012a751431bac (diff) | |
Core/Misc: Fix static analysis issues
Diffstat (limited to 'src/server/scripts/Kalimdor')
4 files changed, 4 insertions, 5 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 6d05e6094b1..1aa96375a41 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 145e13155b1..3eeeefcd8f2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -167,7 +167,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_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 2ac6d96b883..83cf9ac1680 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -596,8 +596,7 @@ public: me->GetMotionMaster()->MoveCharge(-8117.99f, 1532.24f, 3.94f, 4); break; case 60: - if (player) - Talk(ANACHRONOS_SAY_10, player); + Talk(ANACHRONOS_SAY_10, player); me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); break; case 61: diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 2029ee3fbba..9e8c88ad8d8 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -487,7 +487,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); |