diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-12 09:02:51 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-12 09:02:51 -0700 |
| commit | 4396df127c84e305a2c1fb4713e374e7570c3934 (patch) | |
| tree | e19607d534dc5b96ae83ceb5330108bf0dffd2ad | |
| parent | 6f6475a72e826c1f864fa30fb8b73507a38ccee9 (diff) | |
| parent | c6d4ae43c3b9b8df34a0f651fc5f0cb404d4773f (diff) | |
Merge pull request #7359 from cyberbrest/pull12
[434][Spell]: add new effects and auras.
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 7 | ||||
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuraDefines.h | 10 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 5 |
4 files changed, 28 insertions, 2 deletions
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index d7de72aee1f..cd44c362258 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -886,7 +886,12 @@ enum SpellEffects SPELL_EFFECT_175 = 175, // Unused (4.2.2) SPELL_EFFECT_176 = 176, // Some kind of sanctuary effect (Vanish) SPELL_EFFECT_177 = 177, - TOTAL_SPELL_EFFECTS = 178, + SPELL_EFFECT_178 = 178, + SPELL_EFFECT_179 = 179, + SPELL_EFFECT_180 = 180, + SPELL_EFFECT_181 = 181, + SPELL_EFFECT_182 = 182, + TOTAL_SPELL_EFFECTS = 183, }; enum SpellCastResult diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index c8e41d1fcfa..04809277eb4 100755 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -422,7 +422,15 @@ enum AuraType SPELL_AURA_360 = 360, SPELL_AURA_361 = 361, SPELL_AURA_362 = 362, - TOTAL_AURAS = 363 // 4.2.2 + SPELL_AURA_363 = 363, + SPELL_AURA_364 = 364, + SPELL_AURA_365 = 365, + SPELL_AURA_366 = 366, + SPELL_AURA_367 = 367, + SPELL_AURA_368 = 368, + SPELL_AURA_369 = 369, + SPELL_AURA_370 = 370, + TOTAL_AURAS = 371 // 4.3.4 }; enum AuraObjectType diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index a815c3e805c..097ec0b2e8e 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -416,6 +416,14 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //360 SPELL_AURA_360 &AuraEffect::HandleNULL, //361 SPELL_AURA_361 &AuraEffect::HandleNULL, //362 SPELL_AURA_362 + &AuraEffect::HandleNULL, //363 SPELL_AURA_363 + &AuraEffect::HandleNULL, //364 SPELL_AURA_364 + &AuraEffect::HandleNULL, //365 SPELL_AURA_365 + &AuraEffect::HandleNULL, //366 SPELL_AURA_366 + &AuraEffect::HandleNULL, //367 SPELL_AURA_367 + &AuraEffect::HandleNULL, //368 SPELL_AURA_368 + &AuraEffect::HandleNULL, //369 SPELL_AURA_369 + &AuraEffect::HandleNULL, //370 SPELL_AURA_370 }; AuraEffect::AuraEffect(Aura* base, uint8 effIndex, int32 *baseAmount, Unit* caster): diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 8b620e1e9ea..909d47c4b92 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -244,6 +244,11 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectUnused, //175 SPELL_EFFECT_175 unused &Spell::EffectNULL, //176 SPELL_EFFECT_176 &Spell::EffectNULL, //177 SPELL_EFFECT_177 + &Spell::EffectNULL, //178 SPELL_EFFECT_178 + &Spell::EffectNULL, //179 SPELL_EFFECT_179 + &Spell::EffectNULL, //180 SPELL_EFFECT_180 + &Spell::EffectNULL, //181 SPELL_EFFECT_181 + &Spell::EffectNULL, //182 SPELL_EFFECT_182 }; void Spell::EffectNULL(SpellEffIndex /*effIndex*/) |