Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core: Continued cleanup

Browse Source 
If and for whitespaces.
This commit is contained in:
kaelima committed 2011-06-12 02:30:32 +02:00
1 parent da03bbbdab
commit b9e8694540
46 files changed
+219 -222
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Spells/Spell.cpp
+12 -12
View File
@@ -297,10 +297,10 @@ void SpellCastTargets::read (ByteBuffer & data, Unit* caster)
if (m_targetMask & (TARGET_FLAG_OBJECT))
data.readPackGUID(m_GOTargetGUID);
if(m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM))
if (m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM))
data.readPackGUID(m_itemTargetGUID);
if(m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE))
if (m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE))
data.readPackGUID(m_CorpseTargetGUID);
if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION)
@@ -337,7 +337,7 @@ void SpellCastTargets::read (ByteBuffer & data, Unit* caster)
m_dstPos.Relocate(caster);
}
if(m_targetMask & TARGET_FLAG_STRING)
if (m_targetMask & TARGET_FLAG_STRING)
data >> m_strTarget;
Update(caster);
@@ -358,20 +358,20 @@ void SpellCastTargets::write (ByteBuffer & data)
}
else if (m_targetMask & TARGET_FLAG_OBJECT)
{
if(m_GOTarget)
if (m_GOTarget)
data.append(m_GOTarget->GetPackGUID());
else
data << uint8(0);
}
else if (m_targetMask & ( TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE))
else if (m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE))
data.appendPackGUID(m_CorpseTargetGUID);
else
data << uint8(0);
}
if (m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM))
if (m_targetMask & (TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM))
{
if(m_itemTarget)
if (m_itemTarget)
data.append(m_itemTarget->GetPackGUID());
else
data << uint8(0);
@@ -1074,7 +1074,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
{
uint8 farMask = 0;
// create far target mask
for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (IsFarUnitTargetEffect(m_spellInfo->Effect[i]))
if ((1 << i) & mask)
farMask |= (1 << i);
@@ -1088,7 +1088,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
// do far effects on the unit
// can't use default call because of threading, do stuff as fast as possible
for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (farMask & (1 << i))
HandleEffects(unit, NULL, NULL, i);
return;
@@ -4619,13 +4619,13 @@ SpellCastResult Spell::CheckCast(bool strict)
if (bg->GetStatus() == STATUS_WAIT_LEAVE)
return SPELL_FAILED_DONT_REPORT;
if(m_caster->GetTypeId() == TYPEID_PLAYER && VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled())
if (m_caster->GetTypeId() == TYPEID_PLAYER && VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled())
{
if(m_spellInfo->Attributes & SPELL_ATTR0_OUTDOORS_ONLY &&
if (m_spellInfo->Attributes & SPELL_ATTR0_OUTDOORS_ONLY &&
!m_caster->GetMap()->IsOutdoors(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ()))
return SPELL_FAILED_ONLY_OUTDOORS;
if(m_spellInfo->Attributes & SPELL_ATTR0_INDOORS_ONLY &&
if (m_spellInfo->Attributes & SPELL_ATTR0_INDOORS_ONLY &&
m_caster->GetMap()->IsOutdoors(m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ()))
return SPELL_FAILED_ONLY_INDOORS;
}