diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-29 17:11:25 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-29 17:11:25 +0200 |
| commit | cb8f159cea6d6895c1412fa74d209a3dc2298c4b (patch) | |
| tree | 56944635f2e06854637f5c689028dcbfd2ede8b5 /src/server/scripts/Spells | |
| parent | a08b52aa197a31b9821f3f9ef425da6365065907 (diff) | |
| parent | 1bb3c4a2b4e3e974f09c0df478245f8daa3a677c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_priest.cpp
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 478473bf89e..0e011d6c99f 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -95,7 +95,7 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_AEGIS_HEAL, true, NULL, aurEff); @@ -279,7 +279,7 @@ class spell_item_desperate_defense : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_DESPERATE_RAGE, true, NULL, aurEff); |