Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 11:52:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: fixed warnings and building connection patcher with boost versions below 1.61

Browse Source
This commit is contained in:
Ovahlord
2019-11-05 16:53:41 +01:00
parent abd3d58d57
commit 15f09fb82b
104 changed files with 297 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -1443,8 +1443,6 @@ class spell_dk_army_of_the_dead : public AuraScript
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_army_of_the_dead::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
}
private:
uint32 absorbPct;
};
// -49588 Unholy Command

8
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -1158,7 +1158,7 @@ class spell_dru_solar_beam : public AuraScript
GetTarget()->CastSpell(dyn->GetPositionX(), dyn->GetPositionY(), dyn->GetPositionZ(), SPELL_DRUID_SOLAR_BEAM_SILENCE, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_solar_beam::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
}
@@ -1287,7 +1287,7 @@ class spell_dru_rejuvenation : public AuraScript
}
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_rejuvenation::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_rejuvenation::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
@@ -1330,7 +1330,7 @@ class spell_dru_tree_of_life : public AuraScript
}
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_tree_of_life::AfterApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_tree_of_life::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
@@ -1446,7 +1446,7 @@ class spell_dru_wild_mushroom : public SpellScript
}
}
void Register()
void Register() override
{
AfterCast += SpellCastFn(spell_dru_wild_mushroom::HandleSummon);
}

14
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -4536,7 +4536,7 @@ class spell_gen_armor_specialization : public SpellScriptLoader
player->CastSpell(player, spellId, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_armor_specialization_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
@@ -4576,7 +4576,7 @@ class spell_gen_pvp_trinket : public SpellScriptLoader
}
}
void Register()
void Register() override
{
AfterHit += SpellHitFn(spell_gen_pvp_trinket_SpellScript::HandlePvPTrinketVisual);
}
@@ -4634,7 +4634,7 @@ class spell_gen_blink : public SpellScriptLoader
}
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_gen_blink_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
@@ -4664,7 +4664,7 @@ public:
Trinity::Containers::RandomResize(targets, 1);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_toxic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
@@ -4725,7 +4725,7 @@ class spell_gen_projectile_goods : public SpellScriptLoader
GetCaster()->CastSpell(GetHitUnit(), spellId, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_projectile_goods_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
@@ -4919,7 +4919,7 @@ class spell_gen_gilneas_prison_periodic_dummy : public SpellScriptLoader
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_gilneas_prison_periodic_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
@@ -4958,7 +4958,7 @@ class spell_gen_throw_torch : public SpellScriptLoader
player->KilledMonsterCredit(CREDIT_ROUND_UP_WORGEN);
}
void Register()
void Register() override
{
BeforeHit += SpellHitFn(spell_gen_throw_torch_SpellScript::HandleEffect);
}

8
src/server/scripts/Spells/spell_pet.cpp
View File

@@ -375,7 +375,7 @@ class spell_warl_pet_scaling_06 : public AuraScript
amount += int32(meleeHaste);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
@@ -594,7 +594,7 @@ class spell_hun_pet_scaling_03 : public AuraScript
amount = uint32(owner->GetResistance(SpellSchoolMask(GetSpellInfo()->Effects[aurEff->GetEffIndex()].MiscValue)) * 0.4);
}
void CalculateArmorAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
void CalculateArmorAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
if (Pet* pet = GetUnitOwner()->ToPet())
@@ -700,7 +700,7 @@ class spell_hun_pet_scaling_05 : public AuraScript
amount += int32(meleeHaste);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
@@ -972,7 +972,7 @@ class spell_dk_pet_scaling_05 : public AuraScript
amount += owner->GetInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountCritPct, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountResistance, EFFECT_2, SPELL_AURA_MOD_TARGET_RESISTANCE);

12
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -1257,12 +1257,6 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript
{
PrepareSpellScript(spell_pri_holy_word_sanctuary_triggered);
bool Load()
{
_targets = 0;
return true;
}
void HandleHeal(SpellEffIndex /*effIndex*/)
{
if (GetHitHeal() && _targets > 6)
@@ -1281,7 +1275,7 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript
}
private:
uint32 _targets;
uint32 _targets = 0;
};
// -81659 - Evangelism
@@ -1430,7 +1424,7 @@ class spell_power_word_barrier : public AuraScript
{
PrepareAuraScript(spell_power_word_barrier);
bool Load()
bool Load() override
{
TempSummon* summon = GetCaster()->ToTempSummon();
if (!summon)
@@ -1457,7 +1451,7 @@ class spell_power_word_barrier : public AuraScript
}
private:
bool _glyphEnabled;
bool _glyphEnabled = false;
};
// -89488 - Strength of Soul

6
src/server/scripts/Spells/spell_shaman.cpp
View File

@@ -1633,12 +1633,6 @@ class spell_sha_healing_rain_triggered : public SpellScript
{
PrepareSpellScript(spell_sha_healing_rain_triggered);
bool Load()
{
_targets = 0;
return true;
}
void FilterTargets(std::list<WorldObject*>& unitList)
{
_targets = unitList.size();