diff options
Diffstat (limited to 'src')
8 files changed, 26 insertions, 30 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 640fcfa3d23..060322afb31 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -97,7 +97,7 @@ enum Spells SPELL_ANIMATE_BONES_2 = 53336, }; -enum SummonGroups +enum SummonGroups : uint32 { SUMMON_GROUP_CRUSHER_1 = 1, SUMMON_GROUP_CRUSHER_2 = 2, diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 9c8e2aa7dae..cfd5badc3bf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -19,6 +19,7 @@ * Comment: Find in the future best timers and the event is not implemented. */ +#include "Containers.h" #include "ScriptMgr.h" #include "azjol_nerub.h" #include "InstanceScript.h" @@ -947,9 +948,7 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader if (!targetList.empty()) { // If there are, pick one of them at random - std::list<WorldObject*>::iterator it = targetList.begin(); - std::advance(it, urand(0, targetList.size() - 1)); - target = *it; + target = Trinity::Containers::SelectRandomContainerElement(targetList); } // And hit only that one targetList.clear(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index a70f313468d..9b503fec840 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -759,17 +759,16 @@ class spell_valkyr_essences : public SpellScriptLoader { if (dmgInfo.GetSpellInfo()->Id == SPELL_DARK_VORTEX_DAMAGE || dmgInfo.GetSpellInfo()->Id == SPELL_LIGHT_VORTEX_DAMAGE) { - Aura* pAura = owner->GetAura(SPELL_POWERING_UP); - if (pAura) + if (Aura* aura = owner->GetAura(SPELL_POWERING_UP)) { - pAura->ModStackAmount(stacksCount); + aura->ModStackAmount(stacksCount); owner->CastSpell(owner, SPELL_POWERING_UP, true); } else { owner->CastSpell(owner, SPELL_POWERING_UP, true); - if (Aura* pTemp = owner->GetAura(SPELL_POWERING_UP)) - pTemp->ModStackAmount(stacksCount); + if (Aura* newAura = owner->GetAura(SPELL_POWERING_UP)) + newAura->ModStackAmount(stacksCount); } } } @@ -778,18 +777,17 @@ class spell_valkyr_essences : public SpellScriptLoader if (dmgInfo.GetSpellInfo()->Id == SPELL_UNLEASHED_DARK || dmgInfo.GetSpellInfo()->Id == SPELL_UNLEASHED_LIGHT) { // need to do the things in this order, else players might have 100 charges of Powering Up without anything happening - Aura* pAura = owner->GetAura(SPELL_POWERING_UP); - if (pAura) + if (Aura* aura = owner->GetAura(SPELL_POWERING_UP)) { // 2 lines together add the correct amount of buff stacks - pAura->ModStackAmount(stacksCount); + aura->ModStackAmount(stacksCount); owner->CastSpell(owner, SPELL_POWERING_UP, true); } else { owner->CastSpell(owner, SPELL_POWERING_UP, true); - if (Aura* pTemp = owner->GetAura(SPELL_POWERING_UP)) - pTemp->ModStackAmount(stacksCount); + if (Aura* newAura = owner->GetAura(SPELL_POWERING_UP)) + newAura->ModStackAmount(stacksCount); } } } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 1989b424679..6c51cfcdf15 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -233,12 +233,12 @@ public: events.ScheduleEvent(EVENT_TALK_6, Seconds(17)); break; case 35: - if (Player* player = ObjectAccessor::GetPlayer(*me, _player)) - Talk(TALK_7, player); + if (Player* pl = ObjectAccessor::GetPlayer(*me, _player)) + Talk(TALK_7, pl); break; case 40: - if (Player* player = ObjectAccessor::GetPlayer(*me, _player)) - player->GroupEventHappens(QUEST_TRAIL_OF_FIRE, me); + if (Player* pl = ObjectAccessor::GetPlayer(*me, _player)) + pl->GroupEventHappens(QUEST_TRAIL_OF_FIRE, me); events.ScheduleEvent(EVENT_TALK_8, Seconds(4)); break; } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 9e75978b5a1..5728331a762 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -29,8 +29,10 @@ uint32 const OutdoorPvPHPBuffZones[OutdoorPvPHPBuffZonesNum] = { 3483, 3563, 356 uint32 const HP_CREDITMARKER[HP_TOWER_NUM] = { 19032, 19028, 19029 }; +/* uint32 const HP_CapturePointEvent_Enter[HP_TOWER_NUM] = { 11404, 11396, 11388 }; uint32 const HP_CapturePointEvent_Leave[HP_TOWER_NUM] = { 11403, 11395, 11387 }; +*/ uint32 const HP_MAP_N[HP_TOWER_NUM] = { 0x9b5, 0x9b2, 0x9a8 }; uint32 const HP_MAP_A[HP_TOWER_NUM] = { 0x9b3, 0x9b0, 0x9a7 }; 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: diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 6149ebe92ef..5c1b8e735d5 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -199,8 +199,8 @@ class npc_pet_mage_mirror_image : public CreatureScript if (!target || me->GetVictim() != target) { Unit* ownerTarget = nullptr; - if (Player* ownerPlayer = me->GetCharmerOrOwner()->ToPlayer()) - ownerTarget = ownerPlayer->GetSelectedUnit(); + if (Player* playerOwner = me->GetCharmerOrOwner()->ToPlayer()) + ownerTarget = playerOwner->GetSelectedUnit(); // recognize which victim will be choosen if (ownerTarget && ownerTarget->GetTypeId() == TYPEID_PLAYER) |