aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Unit
diff options
context:
space:
mode:
authorBootz <Stage6Dev@EMPulseGaming.com>2011-10-07 10:54:53 -0500
committerBootz <Stage6Dev@EMPulseGaming.com>2011-10-07 10:54:53 -0500
commit96d7a1e9704d8bdf55e2197ce26adbefb0a84e61 (patch)
treedc9ea2734c64e5fea39912b63369f1b5544ca735 /src/server/game/Entities/Unit
parentf1ccb83dc07c0036f832d38e7988816719ada43c (diff)
REPO: code-style clean-up
* Fixed pGuild->guild * Fixed pGroup->group * Fixed pOwner->owner
Diffstat (limited to 'src/server/game/Entities/Unit')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp34
1 files changed, 17 insertions, 17 deletions
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<Unit*> 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<Unit*> &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<Unit*> &nearMembers, float radius)
void Unit::GetPartyMemberInDist(std::list<Unit*> &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<Unit*> &TagUnitMap, float radius)
void Unit::GetPartyMembers(std::list<Unit*> &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();