mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-18 19:37:01 +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); m_spellInfo->speed > 0.0f || (!m_triggeredByAuraSpell && !m_IsTriggeredSpell);
} }
bool Spell::IsTriggeredSpellWithRedundentData() const bool Spell::IsTriggeredSpellWithRedundentCastTime() const
{ {
<<<<<<< HEAD
return m_triggeredByAuraSpell || m_triggeredBySpellInfo || return m_triggeredByAuraSpell || m_triggeredBySpellInfo ||
// possible not need after above check? // possible not need after above check?
m_IsTriggeredSpell && (m_spellInfo->GetManaCost() || m_spellInfo->GetManaCostPercentage()); 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 bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const

4
src/game/Spell.h
View file

@ -476,7 +476,11 @@ class Spell
uint64 GetDelayMoment() const { return m_delayMoment; } uint64 GetDelayMoment() const { return m_delayMoment; }
bool IsNeedSendToClient() const; // use for hide spell cast for client in case when cast not have client side affect (animation or log entries) bool IsNeedSendToClient() const; // use for hide spell cast for client in case when cast not have client side affect (animation or log entries)
<<<<<<< HEAD
bool IsTriggeredSpellWithRedundentData() const; // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundant copy data from main spell for client use purpose bool IsTriggeredSpellWithRedundentData() const; // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundant copy data from main spell for client use purpose
=======
bool IsTriggeredSpellWithRedundentCastTime() const; // use for ignore some spell data for triggered spells like cast time, some triggered spells have redundent copy data from main spell for client use purpose
>>>>>>> 47aa389... [12468] Use normal cast time for triggered spells by default
CurrentSpellTypes GetCurrentContainer(); CurrentSpellTypes GetCurrentContainer();

2
src/game/SpellMgr.cpp
View file

@ -103,7 +103,7 @@ uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell const* spell)
if (spell) if (spell)
{ {
// some triggered spells have data only usable for client // some triggered spells have data only usable for client
if (spell->IsTriggeredSpellWithRedundentData()) if (spell->IsTriggeredSpellWithRedundentCastTime())
return 0; return 0;
// spell targeted to non-trading trade slot item instant at trade success apply // spell targeted to non-trading trade slot item instant at trade success apply

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 "12669" #define REVISION_NR "12670"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__