diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-12-08 15:21:13 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-12-08 15:21:13 +0100 |
| commit | 0daa170a2c4474913b0aad361a93fcfdc9bd9228 (patch) | |
| tree | 78569fb540905ef574956e46f1f77e6c1f57bb2e /src/server/scripts/Northrend | |
| parent | 925557d1c097cd45311b38dc3a9c715579456980 (diff) | |
| parent | 06ea65b0e651be2b389800b5acf9a5e8b86d7444 (diff) | |
Core/Misc: Fix static analysis issues
Fix static analysis issues reported by 3rd party tools
Diffstat (limited to 'src/server/scripts/Northrend')
3 files changed, 5 insertions, 8 deletions
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index a7ea5b57fb0..bd9b66a0f93 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1188,7 +1188,7 @@ public: else if (unit->GetTypeId() == TYPEID_PLAYER) me->SetDisableGravity(true); } - else if (!apply) + else { if (unit->GetTypeId() != TYPEID_PLAYER) { @@ -1291,7 +1291,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 41189cf818b..85aee759e6d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -229,7 +229,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; } diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 6809dce26c2..cb7341f9732 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -159,11 +159,8 @@ public: } break; case 24: - if (player) - { - player->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me); - Talk(SAY_QUEST_COMPLETE, player); - } + player->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me); + Talk(SAY_QUEST_COMPLETE, player); me->SetWalk(false); break; case 25: |