mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11301] Implement SPELL_EFFECT_CANCEL_AURA

Browse source
This commit is contained in:
zergtmn 2011-03-31 13:24:27 +06:00
parent d2d3c22b77
commit 4d262b593d
4 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/SharedDefines.h
View file

@ -735,7 +735,7 @@ enum SpellEffects
SPELL_EFFECT_TALENT_SPEC_COUNT = 161, SPELL_EFFECT_TALENT_SPEC_COUNT = 161,
SPELL_EFFECT_TALENT_SPEC_SELECT = 162, SPELL_EFFECT_TALENT_SPEC_SELECT = 162,
SPELL_EFFECT_163 = 163, SPELL_EFFECT_163 = 163,
SPELL_EFFECT_164 = 164, SPELL_EFFECT_CANCEL_AURA = 164,
TOTAL_SPELL_EFFECTS = 165 TOTAL_SPELL_EFFECTS = 165
}; };

1
src/game/Spell.h
View file

@ -346,6 +346,7 @@ class Spell
void EffectPlayMusic(SpellEffectIndex eff_idx); void EffectPlayMusic(SpellEffectIndex eff_idx);
void EffectSpecCount(SpellEffectIndex eff_idx); void EffectSpecCount(SpellEffectIndex eff_idx);
void EffectActivateSpec(SpellEffectIndex eff_idx); void EffectActivateSpec(SpellEffectIndex eff_idx);
void EffectCancelAura(SpellEffectIndex eff_idx);
Spell(Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID = ObjectGuid(), SpellEntry const* triggeredBy = NULL); Spell(Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
~Spell(); ~Spell();

20
src/game/SpellEffects.cpp
View file

@ -223,8 +223,8 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
&Spell::EffectNULL, //160 SPELL_EFFECT_160 single spell: Nerub'ar Web Random Unit &Spell::EffectNULL, //160 SPELL_EFFECT_160 single spell: Nerub'ar Web Random Unit
&Spell::EffectSpecCount, //161 SPELL_EFFECT_TALENT_SPEC_COUNT second talent spec (learn/revert) &Spell::EffectSpecCount, //161 SPELL_EFFECT_TALENT_SPEC_COUNT second talent spec (learn/revert)
&Spell::EffectActivateSpec, //162 SPELL_EFFECT_TALENT_SPEC_SELECT activate primary/secondary spec &Spell::EffectActivateSpec, //162 SPELL_EFFECT_TALENT_SPEC_SELECT activate primary/secondary spec
&Spell::EffectNULL, //163 &Spell::EffectUnused, //163 unused in 3.3.5a
&Spell::EffectNULL, //164 cancel's some aura... &Spell::EffectCancelAura, //164 SPELL_EFFECT_CANCEL_AURA
}; };
void Spell::EffectEmpty(SpellEffectIndex /*eff_idx*/) void Spell::EffectEmpty(SpellEffectIndex /*eff_idx*/)
@ -8805,3 +8805,19 @@ void Spell::EffectTeachTaxiNode( SpellEffectIndex eff_idx )
player->SendDirectMessage( &data ); player->SendDirectMessage( &data );
} }
} }
void Spell::EffectCancelAura(SpellEffectIndex eff_idx)
{
if (!unitTarget)
return;
uint32 spellId = m_spellInfo->EffectTriggerSpell[eff_idx];
if (!sSpellStore.LookupEntry(spellId))
{
sLog.outError("Spell::EffectCancelAura: spell %u doesn't exist", spellId);
return;
}
unitTarget->RemoveAurasDueToSpell(spellId);
}

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11300" #define REVISION_NR "11301"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__