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

Merge 'master' into 310

Browse source 
Please enter the commit message for your changes. Lines starting
This commit is contained in:
tomrus88 2009-04-18 17:21:29 +04:00
parent 3423b5dbb2
commit 66f554f74d
26 changed files with 513 additions and 395 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/SpellAuras.cpp
View file

@ -468,12 +468,12 @@ Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, target,
{
case SPELL_EFFECT_APPLY_AREA_AURA_PARTY:
m_areaAuraType = AREA_AURA_PARTY;
if(target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->isTotem())
if (target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->isTotem())
m_modifier.m_auraname = SPELL_AURA_NONE;
break;
case SPELL_EFFECT_APPLY_AREA_AURA_RAID:
m_areaAuraType = AREA_AURA_RAID;
if(target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->isTotem())
if (target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->isTotem())
m_modifier.m_auraname = SPELL_AURA_NONE;
break;
case SPELL_EFFECT_APPLY_AREA_AURA_FRIEND:
@ -481,7 +481,7 @@ Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, target,
break;
case SPELL_EFFECT_APPLY_AREA_AURA_ENEMY:
m_areaAuraType = AREA_AURA_ENEMY;
if(target == caster_ptr)
if (target == caster_ptr)
m_modifier.m_auraname = SPELL_AURA_NONE; // Do not do any effect on self
break;
case SPELL_EFFECT_APPLY_AREA_AURA_PET:
@ -489,7 +489,7 @@ Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, target,
break;
case SPELL_EFFECT_APPLY_AREA_AURA_OWNER:
m_areaAuraType = AREA_AURA_OWNER;
if(target == caster_ptr)
if (target == caster_ptr)
m_modifier.m_auraname = SPELL_AURA_NONE;
break;
default: