diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-11-11 21:06:32 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-11-12 12:38:18 +0100 |
| commit | 9b7c73a19df66849ec829fc5a94875aa9593934d (patch) | |
| tree | c45abbad9801977e301fa9fe23d6330497e0f2c4 /src/server/scripts/Outland | |
| parent | 97f33dc77945d8f284d14e0eaa994ae1405a3f20 (diff) | |
Core/Misc: Fix static analysis issues
Diffstat (limited to 'src/server/scripts/Outland')
3 files changed, 8 insertions, 22 deletions
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 39f9947766b..2b0305f374a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -332,9 +332,7 @@ public: if (instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)) { - Unit* victim = nullptr; - victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)); - if (victim) + if (Unit* victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER))) AddThreat(victim, 1); StartEvent(); } @@ -586,9 +584,7 @@ public: //at this point he divides himself in two parts CastConsumingMadness(); DespawnDemon(); - Creature* Copy = nullptr; - Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000); - if (Copy) + if (Creature* Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000)) { Demon = Copy->GetGUID(); if (me->GetVictim()) @@ -764,9 +760,7 @@ public: if (!me->IsInCombat() && instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)) { - Unit* victim = nullptr; - victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)); - if (victim) + if (Unit* victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER))) AttackStart(victim); } @@ -784,10 +778,8 @@ public: if (Mindblast_Timer <= diff) { - Unit* target = nullptr; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - - if (target)DoCast(target, SPELL_MINDBLAST); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_MINDBLAST); Mindblast_Timer = urand(10000, 15000); } else Mindblast_Timer -= diff; diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 57423f63ab0..2b43de82bb5 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -181,9 +181,7 @@ public: //Charging_Timer if (Charging_Timer <= diff) { - Unit* target = nullptr; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (target) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { AttackStart(target); DoCast(target, SPELL_BERSERKER_C); @@ -293,9 +291,7 @@ public: //DeathCoil Timer /need correct timer if (DeathCoil_Timer <= diff) { - Unit* target = nullptr; - target = SelectTarget(SELECT_TARGET_RANDOM, 0); - if (target) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_DEATH_COIL); DeathCoil_Timer = 20000; } else DeathCoil_Timer -= diff; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 9b683770be0..6d65ceae758 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -436,9 +436,7 @@ class boss_alar : public CreatureScript } else { - Unit* target = nullptr; - target = me->SelectNearestTargetInAttackDistance(5); - if (target) + if (Unit* target = me->SelectNearestTargetInAttackDistance(5)) AttackStart(target); else { |