diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-12 01:47:45 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-12 01:47:45 +0200 |
| commit | f16df538eeaecbb5e9364368cfa48d04f48db4de (patch) | |
| tree | 21451f2febc083a2cc6953d1ff88292305fe8364 /src/server/game/Entities/Creature | |
| parent | 158966dc793f47dd4ada264da775f647601298aa (diff) | |
Core: More codestyle cleanups
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rwxr-xr-x | src/server/game/Entities/Creature/Creature.cpp | 14 | ||||
| -rwxr-xr-x | src/server/game/Entities/Creature/CreatureGroups.cpp | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 2013f2403a5..6188c67f64f 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1003,14 +1003,14 @@ void Creature::SetLootRecipient(Unit *unit) return; m_lootRecipient = player->GetGUID(); - if (Group *group = player->GetGroup()) + if (Group* group = player->GetGroup()) m_lootRecipientGroup = group->GetLowGUID(); SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED); } // return true if this creature is tapped by the player or by a member of his group. -bool Creature::isTappedBy(Player *player) const +bool Creature::isTappedBy(Player* player) const { if (player->GetGUID() == m_lootRecipient) return true; @@ -1441,7 +1441,7 @@ bool Creature::canStartAttack(Unit const* who, bool force) const return false; if (who->isInCombat()) - if (Unit *victim = who->getAttackerForHelper()) + if (Unit* victim = who->getAttackerForHelper()) if (IsWithinDistInMap(victim, sWorld->getFloatConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS))) force = true; @@ -1794,7 +1794,7 @@ Unit* Creature::SelectNearestTarget(float dist) const cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - Unit *target = NULL; + Unit* target = NULL; { if (dist == 0.0f) @@ -1821,7 +1821,7 @@ Unit* Creature::SelectNearestTargetInAttackDistance(float dist) const cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - Unit *target = NULL; + Unit* target = NULL; if (dist > ATTACK_DISTANCE) sLog->outError("Creature (GUID: %u Entry: %u) SelectNearestTargetInAttackDistance called with dist > ATTACK_DISTANCE. Extra distance ignored.", GetGUIDLow(), GetEntry()); @@ -1957,7 +1957,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction / // use this function to avoid having hostile creatures attack // friendlies and other mobs they shouldn't attack -bool Creature::_IsTargetAcceptable(const Unit *target) const +bool Creature::_IsTargetAcceptable(const Unit* target) const { ASSERT(target); @@ -1977,7 +1977,7 @@ bool Creature::_IsTargetAcceptable(const Unit *target) const } const Unit *myVictim = getAttackerForHelper(); - const Unit *targetVictim = target->getAttackerForHelper(); + const Unit* targetVictim = target->getAttackerForHelper(); // if I'm already fighting target, or I'm hostile towards the target, the target is acceptable if (myVictim == target || targetVictim == this || IsHostileTo(target)) diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 4dd9ce885f9..a9a0b6119b3 100755 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -26,7 +26,7 @@ CreatureGroupInfoType CreatureGroupMap; -void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member) +void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature* member) { Map *map = member->FindMap(); if (!map) @@ -50,7 +50,7 @@ void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member) } } -void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup *group, Creature *member) +void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup* group, Creature* member) { sLog->outDebug(LOG_FILTER_UNITS, "Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow()); group->RemoveMember(member); @@ -151,7 +151,7 @@ void CreatureGroupManager::LoadCreatureFormations() sLog->outString(); } -void CreatureGroup::AddMember(Creature *member) +void CreatureGroup::AddMember(Creature* member) { sLog->outDebug(LOG_FILTER_UNITS, "CreatureGroup::AddMember: Adding unit GUID: %u.", member->GetGUIDLow()); @@ -166,7 +166,7 @@ void CreatureGroup::AddMember(Creature *member) member->SetFormation(this); } -void CreatureGroup::RemoveMember(Creature *member) +void CreatureGroup::RemoveMember(Creature* member) { if (m_leader == member) m_leader = NULL; @@ -175,7 +175,7 @@ void CreatureGroup::RemoveMember(Creature *member) member->SetFormation(NULL); } -void CreatureGroup::MemberAttackStart(Creature *member, Unit *target) +void CreatureGroup::MemberAttackStart(Creature* member, Unit* target) { uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI; if (!groupAI) @@ -229,7 +229,7 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z) for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { - Creature *member = itr->first; + Creature* member = itr->first; if (member == m_leader || !member->isAlive() || member->getVictim()) continue; |
