aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorSpp <none@none>2010-04-07 18:09:10 +0200
committerSpp <none@none>2010-04-07 18:09:10 +0200
commitb27ce42704c33e292bda390265bb8fd01a433505 (patch)
tree29b2df222a2c1be3325e3d6fab75206100b578fd /src/game/Unit.cpp
parentf490ad5ac259712e323f0a52e608ff1383b2fc41 (diff)
Code Style: Remove trailing spaces
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index e01776a58f0..49dbaec1475 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -6754,7 +6754,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
for (ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) {
if ((*itr)->GetEntry() != 2630)
continue;
-
+
caster = (*itr);
break;
}
@@ -8554,7 +8554,7 @@ FactionTemplateEntry const* Unit::getFactionTemplateEntry() const
sLog.outError("Player %s has invalid faction (faction template id) #%u", player->GetName(), getFaction());
else if (const Creature *creature = ToCreature())
sLog.outError("Creature (template id: %u) has invalid faction (faction template id) #%u", creature->GetCreatureInfo()->Entry, getFaction());
- else
+ else
sLog.outError("Unit (name=%s, type=%u) has invalid faction (faction template id) #%u", GetName(), uint32(GetTypeId()), getFaction());
guid = GetGUID();
@@ -10982,7 +10982,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
{
// Merciless Combat
if ((*i)->GetSpellProto()->SpellIconID == 2656)
- {
+ {
if ((pVictim->GetMaxHealth() * 35 / 100) >= pVictim->GetHealth())
DoneTotalMod *= (100.0f+(*i)->GetAmount())/100.0f;
}
@@ -11367,7 +11367,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
this->ToCreature()->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
if (enemy)
- {
+ {
if (IsAIEnabled)
{
this->ToCreature()->AI()->EnterCombat(enemy);
@@ -11915,7 +11915,7 @@ void Unit::SetHover(bool on)
void Unit::setDeathState(DeathState s)
{
- // death state needs to be updated before RemoveAllAurasOnDeath() calls HandleChannelDeathItem(..) so that
+ // death state needs to be updated before RemoveAllAurasOnDeath() calls HandleChannelDeathItem(..) so that
// it can be used to check creation of death items (such as soul shards).
DeathState oldDeathState = m_deathState;
m_deathState = s;
@@ -14317,7 +14317,7 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
if (EventProcFlag & PROC_FLAG_KILL && GetTypeId() == TYPEID_PLAYER)
{
bool allow = false;
-
+
if (pVictim)
allow = ToPlayer()->isHonorOrXPTarget(pVictim);
@@ -14587,7 +14587,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold);
}
-
+
player->RewardPlayerAndGroupAtKill(pVictim);
}