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

[12671] Fix compile

Browse source 
Signed-off-by: Dramacydal <PulLumBerMal@gmail.com>
This commit is contained in:
Dramacydal 2013-08-19 16:25:55 +03:00 • committed by Antz
parent 3d1d3805a2
commit 5083596e26
3 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/Spell.cpp
View file

@ -7396,13 +7396,7 @@ bool Spell::IsNeedSendToClient() 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
return m_IsTriggeredSpell && (m_spellInfo->GetManaCost() || m_spellInfo->GetManaCostPercentage());
}
bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const

4
src/game/Spell.h
View file

@ -476,11 +476,7 @@ class Spell
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)
<<<<<<< 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 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();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "12670"
#define REVISION_NR "12671"
#endif // __REVISION_NR_H__