diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-05-18 12:50:10 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-05-18 12:50:10 +0200 |
| commit | f9c7bb417150f87c5ac8c161e019d6c292dfec37 (patch) | |
| tree | f8a3c2f8c7ef653d083cbd6dc4bfddbe1cbfab80 /src/server/scripts/Outland | |
| parent | fce80ffa6e0d719c2f7a3ce954dcab491b015541 (diff) | |
Partially revert f296095191c7b5c6b10f79c2b1433dc227a462f5 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."
Visual studio does not support constexpr
Made semicolon after "Prepare*Script" mandatory - workaround for dumb IDEs inserting extra indentation level after newline
Diffstat (limited to 'src/server/scripts/Outland')
10 files changed, 14 insertions, 14 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index d15ee3570c9..31adf1522d4 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -181,7 +181,7 @@ class spell_murmur_sonic_boom : public SpellScriptLoader class spell_murmur_sonic_boom_SpellScript : public SpellScript { - PrepareSpellScript(spell_murmur_sonic_boom_SpellScript) + PrepareSpellScript(spell_murmur_sonic_boom_SpellScript); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -215,7 +215,7 @@ class spell_murmur_sonic_boom_effect : public SpellScriptLoader class spell_murmur_sonic_boom_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_murmur_sonic_boom_effect_SpellScript) + PrepareSpellScript(spell_murmur_sonic_boom_effect_SpellScript); void CalcDamage() { @@ -258,7 +258,7 @@ class spell_murmur_thundering_storm : public SpellScriptLoader class spell_murmur_thundering_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_murmur_thundering_storm_SpellScript) + PrepareSpellScript(spell_murmur_thundering_storm_SpellScript); void FilterTarget(std::list<WorldObject*>& targets) { diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index d17f88de910..4a4addd253e 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -876,7 +876,7 @@ public: class spell_boss_lady_malande_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript) + PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript); bool Validate(SpellInfo const* /*spellInfo*/) override { diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 595bf13791d..592ffc1f69e 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -263,7 +263,7 @@ class spell_gruul_shatter : public SpellScriptLoader class spell_gruul_shatter_SpellScript : public SpellScript { - PrepareSpellScript(spell_gruul_shatter_SpellScript) + PrepareSpellScript(spell_gruul_shatter_SpellScript); bool Validate(SpellInfo const* /*spell*/) override { @@ -302,7 +302,7 @@ class spell_gruul_shatter_effect : public SpellScriptLoader class spell_gruul_shatter_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_gruul_shatter_effect_SpellScript) + PrepareSpellScript(spell_gruul_shatter_effect_SpellScript); void CalculateDamage() { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 23dabdfd80f..063a30ca875 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -195,7 +195,7 @@ class spell_broggok_poison_cloud : public SpellScriptLoader class spell_broggok_poison_cloud_AuraScript : public AuraScript { - PrepareAuraScript(spell_broggok_poison_cloud_AuraScript) + PrepareAuraScript(spell_broggok_poison_cloud_AuraScript); bool Validate(SpellInfo const* spellInfo) override { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 716963391e6..5f92445f9dd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -513,7 +513,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader class spell_astromancer_wrath_of_the_astromancer_AuraScript : public AuraScript { - PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript) + PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript); bool Validate(SpellInfo const* /*spellInfo*/) override { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 7ea39f3faed..f8861d1fa7f 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -163,7 +163,7 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader class spell_capacitus_polarity_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript) + PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript); bool Validate(SpellInfo const* /*spell*/) override { @@ -231,7 +231,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader class spell_capacitus_polarity_shift_SpellScript : public SpellScript { - PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript) + PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript); bool Validate(SpellInfo const* /*spell*/) override { diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 4320dbc422f..7b831e82a75 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -156,7 +156,7 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader class spell_commander_sarannis_summon_reinforcements_SpellScript : public SpellScript { - PrepareSpellScript(spell_commander_sarannis_summon_reinforcements_SpellScript) + PrepareSpellScript(spell_commander_sarannis_summon_reinforcements_SpellScript); void HandleCast(SpellEffIndex /*effIndex*/) { diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 3eeaf8ecafa..eea03aae343 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -182,7 +182,7 @@ class spell_mark_of_kazzak : public SpellScriptLoader class spell_mark_of_kazzak_AuraScript : public AuraScript { - PrepareAuraScript(spell_mark_of_kazzak_AuraScript) + PrepareAuraScript(spell_mark_of_kazzak_AuraScript); bool Validate(SpellInfo const* /*spell*/) override { diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 2f60a4e9106..d21b92d3e92 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -1187,7 +1187,7 @@ class spell_oscillating_field : public SpellScriptLoader class spell_oscillating_field_SpellScript : public SpellScript { - PrepareSpellScript(spell_oscillating_field_SpellScript) + PrepareSpellScript(spell_oscillating_field_SpellScript); void HandleEffect(SpellEffIndex /*effIndex*/) { diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index c9ad9a6964d..4efa108429a 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1824,7 +1824,7 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader class spell_unlocking_zuluheds_chains_SpellScript : public SpellScript { - PrepareSpellScript(spell_unlocking_zuluheds_chains_SpellScript) + PrepareSpellScript(spell_unlocking_zuluheds_chains_SpellScript); void HandleAfterHit() { |
