josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Rename SPELL_EFFECT_CHARGE_2 to SPELL_EFFECT_CHARGE_DEST, fix its implementation.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-07-19 19:22:05 +02:00
parent 07b8d33869
commit e1e16310ec
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellEffects.cpp
+4 -13
View File
@@ -214,7 +214,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
&Spell::EffectActivateRune, //146 SPELL_EFFECT_ACTIVATE_RUNE
&Spell::EffectQuestFail, //147 SPELL_EFFECT_QUEST_FAIL quest fail
&Spell::EffectUnused, //148 SPELL_EFFECT_148 unused
&Spell::EffectCharge2, //149 SPELL_EFFECT_CHARGE2 swoop
&Spell::EffectChargeDest, //149 SPELL_EFFECT_CHARGE_DEST
&Spell::EffectUnused, //150 SPELL_EFFECT_150 unused
&Spell::EffectTriggerRitualOfSummoning, //151 SPELL_EFFECT_TRIGGER_SPELL_2
&Spell::EffectNULL, //152 SPELL_EFFECT_152 summon Refer-a-Friend
@@ -7129,22 +7129,13 @@ void Spell::EffectCharge(uint32 /*i*/)
m_caster->Attack(target, true);
}
void Spell::EffectCharge2(uint32 /*i*/)
void Spell::EffectChargeDest(uint32 /*i*/)
{
float x, y, z;
if (m_targets.HasDst())
m_targets.m_dstPos.GetPosition(x, y, z);
else if (Unit *target = m_targets.getUnitTarget())
{
target->GetContactPoint(m_caster, x, y, z);
// not all charge effects used in negative spells
if (!IsPositiveSpell(m_spellInfo->Id) && m_caster->GetTypeId() == TYPEID_PLAYER)
m_caster->Attack(target, true);
m_targets.m_dstPos.GetPosition(x, y, z);
m_caster->GetMotionMaster()->MoveCharge(x, y, z);
}
else
return;
m_caster->GetMotionMaster()->MoveCharge(x, y, z);
}
void Spell::EffectKnockBack(uint32 i)