From 8abbc097a03555edeed957034d97703e037556d4 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 11 Jun 2017 23:06:39 +0200 Subject: Core/Scripts: fix some /W4 warnings (cherry picked from commit d6cae113c64f1024b11493ee68e06d9b3052bfab) --- .../scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp | 13 +++++-------- .../MagtheridonsLair/instance_magtheridons_lair.cpp | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index a347f72a92d..acacdfddc38 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -338,15 +338,12 @@ public: { if (Creature* teron = _instance->GetCreature(DATA_TERON_GOREFIEND)) { - if (Unit* target = teron->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, -SPELL_SPIRITUAL_VENGEANCE)) - { - DoResetThreat(); - AttackStart(target); - me->AddThreat(target, 1000000.0f); - targetGUID = target->GetGUID(); - } + Unit* target = teron->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, -SPELL_SPIRITUAL_VENGEANCE); // He should target Vengeful Spirits only if has no other player available - else if (Unit* target = teron->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (!target) + target = teron->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); + + if (target) { DoResetThreat(); AttackStart(target); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 8cd4bbc9cf0..233e72b0ad2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -116,8 +116,8 @@ class instance_magtheridons_lair : public InstanceMapScript HandleGameObject(ObjectGuid::Empty, value == ACTION_ENABLE ? true : false, hall); break; case DATA_COLLAPSE_2: - for (MLDataTypes data : collapseObjectDatas) - if (GameObject* go = GetGameObject(data)) + for (MLDataTypes type : collapseObjectDatas) + if (GameObject* go = GetGameObject(type)) HandleGameObject(ObjectGuid::Empty, value == ACTION_ENABLE ? true : false, go); break; case DATA_CALL_WARDERS: -- cgit v1.2.3