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

[12670] Use normal cast time for triggered spells by default

Browse source 
Close cmangos/issues#195

Please report problems that might (or might not) arise

Signed-off-by: Schmoozerd <schmoozerd@cmangos>

(based on commit [12468] - 47aa389)
This commit is contained in:
Schmoozerd 2013-08-19 16:21:05 +03:00 • committed by Antz
parent 5e944a2c12
commit 3d1d3805a2
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Spell.cpp
View file

@ -7394,11 +7394,15 @@ bool Spell::IsNeedSendToClient() const
m_spellInfo->speed > 0.0f || (!m_triggeredByAuraSpell && !m_IsTriggeredSpell);
}
bool Spell::IsTriggeredSpellWithRedundentData() const
bool Spell::IsTriggeredSpellWithRedundentCastTime() const
{
<<<<<<< HEAD
return m_triggeredByAuraSpell || m_triggeredBySpellInfo ||
// possible not need after above check?
m_IsTriggeredSpell && (m_spellInfo->GetManaCost() || m_spellInfo->GetManaCostPercentage());
=======
return m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage);
>>>>>>> 47aa389... [12468] Use normal cast time for triggered spells by default
}
bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const