From 96d7a1e9704d8bdf55e2197ce26adbefb0a84e61 Mon Sep 17 00:00:00 2001 From: Bootz Date: Fri, 7 Oct 2011 10:54:53 -0500 Subject: REPO: code-style clean-up * Fixed pGuild->guild * Fixed pGroup->group * Fixed pOwner->owner --- src/server/game/Entities/Unit/Unit.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/server/game/Entities/Unit') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6f042e7f0c4..7aeca6e4b39 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10081,9 +10081,9 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) if (!player) return NULL; - Group* pGroup = player->GetGroup(); + Group* group = player->GetGroup(); // When there is no group check pet presence - if (!pGroup) + if (!group) { // We are pet now, return owner if (player != this) @@ -10098,9 +10098,9 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius) std::vector nearMembers; // reserve place for players and pets because resizing vector every unit push is unefficient (vector is reallocated then) - nearMembers.reserve(pGroup->GetMembersCount() * 2); + nearMembers.reserve(group->GetMembersCount() * 2); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) if (Player* Target = itr->getSource()) { // IsHostileTo check duel and controlled by enemy @@ -15682,8 +15682,8 @@ void Unit::SetStunned(bool apply) SetTarget(getVictim()->GetGUID()); // don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface) - Unit* pOwner = GetOwner(); - if (!pOwner || (pOwner->GetTypeId() == TYPEID_PLAYER && !pOwner->ToPlayer()->IsMounted())) + Unit* owner = GetOwner(); + if (!owner || (owner->GetTypeId() == TYPEID_PLAYER && !owner->ToPlayer()->IsMounted())) RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); if (!HasUnitState(UNIT_STAT_ROOT)) // prevent allow move if have also root effect @@ -16183,10 +16183,10 @@ void Unit::GetRaidMember(std::list &nearMembers, float radius) if (!owner) return; - Group* pGroup = owner->GetGroup(); - if (pGroup) + Group* group = owner->GetGroup(); + if (group) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -16214,15 +16214,15 @@ void Unit::GetRaidMember(std::list &nearMembers, float radius) void Unit::GetPartyMemberInDist(std::list &TagUnitMap, float radius) { Unit* owner = GetCharmerOrOwnerOrSelf(); - Group* pGroup = NULL; + Group* group = NULL; if (owner->GetTypeId() == TYPEID_PLAYER) - pGroup = owner->ToPlayer()->GetGroup(); + group = owner->ToPlayer()->GetGroup(); - if (pGroup) + if (group) { uint8 subgroup = owner->ToPlayer()->GetSubGroup(); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); @@ -16251,15 +16251,15 @@ void Unit::GetPartyMemberInDist(std::list &TagUnitMap, float radius) void Unit::GetPartyMembers(std::list &TagUnitMap) { Unit* owner = GetCharmerOrOwnerOrSelf(); - Group* pGroup = NULL; + Group* group = NULL; if (owner->GetTypeId() == TYPEID_PLAYER) - pGroup = owner->ToPlayer()->GetGroup(); + group = owner->ToPlayer()->GetGroup(); - if (pGroup) + if (group) { uint8 subgroup = owner->ToPlayer()->GetSubGroup(); - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* Target = itr->getSource(); -- cgit v1.2.3