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

*Fix build.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-22 23:13:20 -06:00
parent ab4b9160f2
commit 4facfd5572
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+1 -6
View File
@@ -1898,10 +1898,9 @@ void Aura::TriggerSpell()
} }
} }
} }
<<<<<<< HEAD:src/game/SpellAuras.cpp
if(!GetSpellMaxRange(sSpellRangeStore.LookupEntry(triggeredSpellInfo->rangeIndex))) if(!GetSpellMaxRange(sSpellRangeStore.LookupEntry(triggeredSpellInfo->rangeIndex)))
target = m_target; //for druid dispel poison target = m_target; //for druid dispel poison
m_target->CastSpell(target, triggeredSpellInfo, true, 0, this, originalCasterGUID); m_target->CastSpell(target, triggeredSpellInfo, true, 0, this, GetCasterGUID());
} }
Unit* Aura::GetTriggerTarget() const Unit* Aura::GetTriggerTarget() const
@@ -1911,9 +1910,6 @@ Unit* Aura::GetTriggerTarget() const
((Player*)m_target)->GetSelection() :*/ ((Player*)m_target)->GetSelection() :*/
m_target->GetUInt64Value(UNIT_FIELD_TARGET)); m_target->GetUInt64Value(UNIT_FIELD_TARGET));
return target ? target : m_target; return target ? target : m_target;
=======
// All ok cast by default case
caster->CastSpell(target, triggeredSpellInfo, true, 0, this);
} }
void Aura::TriggerSpellWithValue() void Aura::TriggerSpellWithValue()
@@ -1929,7 +1925,6 @@ void Aura::TriggerSpellWithValue()
int32 basepoints0 = this->GetModifier()->m_amount; int32 basepoints0 = this->GetModifier()->m_amount;
caster->CastCustomSpell(target, trigger_spell_id, &basepoints0, 0, 0, true, 0, this); caster->CastCustomSpell(target, trigger_spell_id, &basepoints0, 0, 0, true, 0, this);
>>>>>>> upstream/master:src/game/SpellAuras.cpp
} }
/*********************************************************/ /*********************************************************/
src/game/SpellEffects.cpp
+2 -8
View File
@@ -4370,16 +4370,10 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
Unit::AuraList const& list = unitTarget->GetAurasByType(SPELL_AURA_MOD_RESISTANCE); Unit::AuraList const& list = unitTarget->GetAurasByType(SPELL_AURA_MOD_RESISTANCE);
for(Unit::AuraList::const_iterator itr=list.begin();itr!=list.end();++itr) for(Unit::AuraList::const_iterator itr=list.begin();itr!=list.end();++itr)
{ {
<<<<<<< HEAD:src/game/SpellEffects.cpp
SpellEntry const *proto = (*itr)->GetSpellProto(); SpellEntry const *proto = (*itr)->GetSpellProto();
if(proto->SpellFamilyName == SPELLFAMILY_WARRIOR if(proto->SpellFamilyName == SPELLFAMILY_WARRIOR
&& proto->SpellFamilyFlags == SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR) && proto->SpellFamilyFlags == SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR
======= && (*itr)->GetCasterGUID() == m_caster->GetGUID())
SpellEntry const *spellInfo = (*itr).second->GetSpellProto();
if( spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR &&
spellInfo->SpellFamilyFlags & 0x0000000000004000LL &&
(*itr).second->GetCasterGUID() == m_caster->GetGUID())
>>>>>>> upstream/master:src/game/SpellEffects.cpp
{ {
(*itr)->RefreshAura(); (*itr)->RefreshAura();
stack = (*itr)->GetStackAmount(); stack = (*itr)->GetStackAmount();