Scripts: fixed more warnings

This commit is contained in:
Ovahlord
2019-10-04 15:58:38 +02:00
parent 3214588fbe
commit 5a02e15e86
14 changed files with 25 additions and 23 deletions

View File

@@ -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();

View File

@@ -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 });
}

View File

@@ -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;

View File

@@ -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();

View File

@@ -61,7 +61,7 @@ public:
}
}
void WaypointReached(uint32 waypointId, uint32 pathId) override
void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
{
Player* player = GetPlayerForEscort();
if (!player)

View File

@@ -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);

View File

@@ -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);
}

View File

@@ -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)
{

View File

@@ -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();

View File

@@ -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())

View File

@@ -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())

View File

@@ -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 });
}

View File

@@ -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);
}

View File

@@ -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())