diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index f29c9ca7b07..c23ae4523df 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -131,7 +131,7 @@ struct boss_temple_guardian_anhuur : public BossAI Talk(SAY_KILL); } - void EnterEvadeMode(EvadeReason why) override + void EnterEvadeMode(EvadeReason /*why*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _EnterEvadeMode(); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp index 8b9dec9560a..94399caeb87 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp @@ -233,7 +233,7 @@ class spell_hoo_emerge : public SpellScript { PrepareSpellScript(spell_hoo_emerge); - bool Validate(SpellInfo const* spellInfo) override + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUBMERGE }); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index 5ccfd996186..926fcf47998 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -277,11 +277,15 @@ class instance_halls_of_origination : public InstanceMapScript break; case DATA_SUMMON_SANDSTORM_ADDS: for (ObjectGuid guid : _beetleStalkerGUIDS) + { if (Creature* beetleStalker = instance->GetCreature(guid)) + { if (-400.f < beetleStalker->GetPositionY() && beetleStalker->GetPositionY() < -390.f) // 2 stalkers in the middle beetleStalker->CastSpell(beetleStalker, SPELL_SUMMON_DUSTBONE_HORROR); else beetleStalker->CastSpell(beetleStalker, SPELL_BEETLE_BURROW); + } + } break; case DATA_VAULT_OF_LIGHTS: _vaultOfLightState = value; diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp index 8a2e6cddc77..61e1d0d7440 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp @@ -642,7 +642,7 @@ public: } break; case EVENT_CHECK_DISTANCE: - if (Creature* harbinger = me->FindNearestCreature(NPC_HARBINGER_OF_DARKNESS, 0.3f, true)) + if (me->FindNearestCreature(NPC_HARBINGER_OF_DARKNESS, 0.3f, true)) { Talk(SAY_ANNOUNCE_MERGE_SOUL); me->CastStop(); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index e79d1e21e1f..1c94f659fd3 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -61,7 +61,7 @@ public: } } - void WaypointReached(uint32 waypointId, uint32 pathId) override + void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override { Player* player = GetPlayerForEscort(); if (!player) diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp index 716cdef7d39..feb11d55e31 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp @@ -303,7 +303,7 @@ struct boss_alakir : public BossAI _useTempoaryCloudSpawns = false; } - void JustEngagedWith(Unit* who) override + void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp index de0e4bea41f..095ae2ebc73 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp @@ -263,7 +263,7 @@ struct boss_anshal : public BossAI Talk(SAY_SLAY); } - void EnterEvadeMode(EvadeReason why) override + void EnterEvadeMode(EvadeReason /*why*/) override { _EnterEvadeMode(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); @@ -341,7 +341,7 @@ struct boss_anshal : public BossAI } } - void SpellHitTarget(Unit* target, SpellInfo const* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_WIND_DISTANCE_CHECKER) { @@ -502,7 +502,7 @@ struct boss_nezir : public BossAI Talk(SAY_SLAY); } - void EnterEvadeMode(EvadeReason why) override + void EnterEvadeMode(EvadeReason /*why*/) override { _EnterEvadeMode(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); @@ -580,7 +580,7 @@ struct boss_nezir : public BossAI } } - void SpellHitTarget(Unit* target, SpellInfo const* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_WIND_DISTANCE_CHECKER) { @@ -740,7 +740,7 @@ struct boss_rohash : public BossAI Talk(SAY_SLAY); } - void EnterEvadeMode(EvadeReason why) override + void EnterEvadeMode(EvadeReason /*why*/) override { _EnterEvadeMode(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); @@ -1054,7 +1054,7 @@ class spell_conclave_of_wind_winds_pre_effect_warning : public AuraScript { PrepareAuraScript(spell_conclave_of_wind_winds_pre_effect_warning); - void OnAuraRemoveHandler(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) if (Unit* caster = GetCaster()) @@ -1192,7 +1192,7 @@ class spell_conclave_of_wind_hurricane : public SpellScript return ValidateSpellInfo({ SPELL_HURRICANE_RIDE_VEHICLE }); } - void HandleScriptEffect(SpellEffIndex effIndex) + void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_HURRICANE_RIDE_VEHICLE, true); } diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp index a7af2a31fe0..65554681a32 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp @@ -242,7 +242,7 @@ class instance_throne_of_the_four_winds : public InstanceMapScript return true; } - void SetData(uint32 data, uint32 value) override + void SetData(uint32 data, uint32 /*value*/) override { switch (data) { diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp index 0c46e5d121c..6430dd30a0a 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp @@ -343,7 +343,7 @@ class spell_altairus_safe_area : public AuraScript return ValidateSpellInfo({ SPELL_LIGHTNING_BLAST }); } - void HandleLightningBlast(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + void HandleLightningBlast(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); InstanceScript* instance = target->GetInstanceScript(); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp index 7532b698300..fcae5536131 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp @@ -367,7 +367,7 @@ class npc_crystal_shard : public CreatureScript _events.ScheduleEvent(EVENT_REMOVE_SHRINK_AURA, Seconds(1) + Milliseconds(200)); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_CRYSTAL_SHARDS_TARGET) { @@ -431,7 +431,7 @@ class spell_corborus_crystal_barrage_targeting : public SpellScript Trinity::Containers::RandomResize(targets, 1); } - void HandleEffect(SpellEffIndex effIndex) + void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) { @@ -456,7 +456,7 @@ class spell_corborus_crystal_barrage : public AuraScript return ValidateSpellInfo({ SPELL_CRYSTAL_BARRAGE_SHARD }); } - void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) if (caster->GetMap()->IsHeroic()) diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index d8e0a22f745..051aef12c34 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -291,7 +291,7 @@ class spell_ozruk_paralyze_stun : public AuraScript return ValidateSpellInfo({ SPELL_PARALYZE_DAMAGE }); } - void OnAuraRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + void OnAuraRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) if (Unit* target = GetUnitOwner()) diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index 43024530bae..5cde6f57b25 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -390,8 +390,8 @@ class spell_sc_ring_wyrm_knockback : public SpellScript Unit* caster = GetCaster(); float angle = caster->GetOrientation(); - float x = caster->GetPositionX() + cos(caster->GetOrientation() + float(M_PI)) * 100.0f; - float y = caster->GetPositionY() + sin(caster->GetOrientation() + float(M_PI)) * 100.0f; + float x = caster->GetPositionX() + cos(angle + float(M_PI)) * 100.0f; + float y = caster->GetPositionY() + sin(angle + float(M_PI)) * 100.0f; float z = caster->GetPositionZ(); dest.Relocate({ x, y, z, 0.0f }); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index e3d6cc7ca26..fd71e551190 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -981,7 +981,7 @@ class spell_mage_mana_shield : public SpellScriptLoader void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (AuraEffect* aurEff = GetTarget()->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_GENERIC, ICON_MAGE_INCANTER_S_ABSORPTION, EFFECT_0)) + if (GetTarget()->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_GENERIC, ICON_MAGE_INCANTER_S_ABSORPTION, EFFECT_0)) if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL) GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_INCANTERS_ABSORBTION_KNOCKBACK, true); } diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 59b65433e51..82b2a4d14e4 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -597,8 +597,6 @@ class spell_hun_pet_scaling_03 : public AuraScript void CalculateArmorAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; - int32 resistanceSchool = GetSpellInfo()->Effects[aurEff->GetEffIndex()].MiscValue; - if (Pet* pet = GetUnitOwner()->ToPet()) { if (Player* owner = pet->GetOwner())