diff options
| author | megamage <none@none> | 2009-01-22 23:13:20 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-22 23:13:20 -0600 |
| commit | 4facfd55724bcc1b69543e192fd0598a17fcd422 (patch) | |
| tree | ab3fb35d5c35bd1ab8bd0930c7f14b9019af7119 /src | |
| parent | ab4b9160f2d1d534832372422fd1e2bc514b808a (diff) | |
*Fix build.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 7 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 6f6224795d1..6f485561639 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1898,10 +1898,9 @@ void Aura::TriggerSpell() } } } -<<<<<<< HEAD:src/game/SpellAuras.cpp if(!GetSpellMaxRange(sSpellRangeStore.LookupEntry(triggeredSpellInfo->rangeIndex))) 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 @@ -1911,9 +1910,6 @@ Unit* Aura::GetTriggerTarget() const ((Player*)m_target)->GetSelection() :*/ m_target->GetUInt64Value(UNIT_FIELD_TARGET)); return target ? target : m_target; -======= - // All ok cast by default case - caster->CastSpell(target, triggeredSpellInfo, true, 0, this); } void Aura::TriggerSpellWithValue() @@ -1929,7 +1925,6 @@ void Aura::TriggerSpellWithValue() int32 basepoints0 = this->GetModifier()->m_amount; caster->CastCustomSpell(target, trigger_spell_id, &basepoints0, 0, 0, true, 0, this); ->>>>>>> upstream/master:src/game/SpellAuras.cpp } /*********************************************************/ diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index e7c67f4f41e..f4842154ed8 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4370,16 +4370,10 @@ void Spell::SpellDamageWeaponDmg(uint32 i) Unit::AuraList const& list = unitTarget->GetAurasByType(SPELL_AURA_MOD_RESISTANCE); for(Unit::AuraList::const_iterator itr=list.begin();itr!=list.end();++itr) { -<<<<<<< HEAD:src/game/SpellEffects.cpp SpellEntry const *proto = (*itr)->GetSpellProto(); if(proto->SpellFamilyName == SPELLFAMILY_WARRIOR - && proto->SpellFamilyFlags == SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR) -======= - 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 + && proto->SpellFamilyFlags == SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR + && (*itr)->GetCasterGUID() == m_caster->GetGUID()) { (*itr)->RefreshAura(); stack = (*itr)->GetStackAmount(); |