From c099174ff777d1bf5061f5cdc197ff17bd83fbb7 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 22 Jan 2018 23:55:33 -0300 Subject: Core/Misc: fix some /W4 warnings and some reported by GCC 6.3 --- .../Northrend/Ulduar/Ulduar/boss_auriaya.cpp | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index d4cad450d83..79a8f44b475 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -567,7 +567,7 @@ class spell_auriaya_agro_creator : public SpellScript } }; -// 61906 - Random Aggro Periodic (5 sec) +// 61906 - Random Aggro Periodic (5 sec) class spell_auriaya_random_agro_periodic : public AuraScript { PrepareAuraScript(spell_auriaya_random_agro_periodic); @@ -583,17 +583,16 @@ class spell_auriaya_random_agro_periodic : public AuraScript if (!owner || !owner->IsAIEnabled || owner->HasReactState(REACT_PASSIVE)) return; - if (Unit* target = owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, CatsTargetSelector(owner, 15.0f, 25.0f))) - { - owner->GetThreatManager().AddThreat(target, 3000000.0f, nullptr, true); - owner->CastSpell(target, SPELL_FERAL_POUNCE, true); - owner->AI()->AttackStart(target); - } - else if (Unit* target = owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) - { - owner->GetThreatManager().AddThreat(target, 3000000.0f); - owner->AI()->AttackStart(target); - } + Unit* target = owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, CatsTargetSelector(owner, 15.0f, 25.0f)); + if (!target) + target = owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); + + if (!target) + return; + + owner->GetThreatManager().AddThreat(target, 3000000.0f, nullptr, true); + owner->CastSpell(target, SPELL_FERAL_POUNCE, true); + owner->AI()->AttackStart(target); } void Register() override -- cgit v1.2.3