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

[10629] Drop function GuidHigh2TypeId

Browse source 
Added ObjectGuid version Aura::GetCasterGuid()

But for prevent big problen with backporting AuraHolder
to mangos-0.12 in most cases still used old uint64 version
Aura::GetCasterGUID.

Recommended use new version where possible in clean way
as done for some cases in commit already.
This commit is contained in:
VladimirMangos 2010-10-20 08:49:27 +04:00
parent fdc5a1dd67
commit 31c9efd219
17 changed files with 54 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/SpellEffects.cpp
View file

@ -466,7 +466,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
uint32 counter = 0;
Unit::AuraList const& dotAuras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
for(Unit::AuraList::const_iterator itr = dotAuras.begin(); itr!=dotAuras.end(); ++itr)
if ((*itr)->GetCasterGUID() == owner->GetGUID())
if ((*itr)->GetCasterGuid() == owner->GetObjectGuid())
++counter;
if (counter)
@ -482,7 +482,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
{
// for caster applied auras only
if ((*i)->GetSpellProto()->SpellFamilyName != SPELLFAMILY_WARLOCK ||
(*i)->GetCasterGUID()!=m_caster->GetGUID())
(*i)->GetCasterGuid() != m_caster->GetObjectGuid())
continue;
// Immolate
@ -574,9 +574,9 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
// Lookup for Deadly poison (only attacker applied)
Unit::AuraList const& auras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
for(Unit::AuraList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE &&
if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE &&
((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x10000)) &&
(*itr)->GetCasterGUID()==m_caster->GetGUID() )
(*itr)->GetCasterGuid() == m_caster->GetObjectGuid())
{
poison = *itr;
break;
@ -718,7 +718,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx)
Unit::AuraList const& auras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
for(Unit::AuraList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
{
if( ((*itr)->GetId() == debuf_id) && (*itr)->GetCasterGUID()==m_caster->GetGUID())
if (((*itr)->GetId() == debuf_id) && (*itr)->GetCasterGuid()==m_caster->GetObjectGuid())
{
stacks = (*itr)->GetStackAmount();
break;