aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorkandera <kanderacutie@hotmail.com>2012-03-14 09:59:45 -0700
committerkandera <kanderacutie@hotmail.com>2012-03-14 09:59:45 -0700
commitfedb27b601553ef7837ff3d15980493f827fb38f (patch)
treef4e0cab1ba6890bfa7c75fe763859667e4fa03fc /src/server/scripts/Outland
parent69c3612cfe50777e6895ec8a8f57e370a5c99c3e (diff)
parent20cd4c71ee6336610daab304959909b2f6397287 (diff)
Merge pull request #5714 from thomas33/master
more cleanup in files
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/BlackTemple/illidari_council.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index c313a2138a6..fab0188de4d 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -176,9 +176,9 @@ public:
{
if (AggroYellTimer <= diff)
{
- if (Unit* pMember = Unit::GetUnit(*me, Council[YellCounter]))
+ if (Unit* member = Unit::GetUnit(*me, Council[YellCounter]))
{
- DoScriptText(CouncilAggro[YellCounter].entry, pMember);
+ DoScriptText(CouncilAggro[YellCounter].entry, member);
AggroYellTimer = CouncilAggro[YellCounter].timer;
}
++YellCounter;
@@ -191,10 +191,10 @@ public:
{
if (EnrageTimer <= diff)
{
- if (Unit* pMember = Unit::GetUnit(*me, Council[YellCounter]))
+ if (Unit* member = Unit::GetUnit(*me, Council[YellCounter]))
{
- pMember->CastSpell(pMember, SPELL_BERSERK, true);
- DoScriptText(CouncilEnrage[YellCounter].entry, pMember);
+ member->CastSpell(member, SPELL_BERSERK, true);
+ DoScriptText(CouncilEnrage[YellCounter].entry, member);
EnrageTimer = CouncilEnrage[YellCounter].timer;
}
++YellCounter;
@@ -242,19 +242,19 @@ public:
DeathCount = 0;
- Creature* pMember = NULL;
+ Creature* member = NULL;
for (uint8 i = 0; i < 4; ++i)
{
- pMember = Unit::GetCreature((*me), Council[i]);
- if (!pMember)
+ member = Unit::GetCreature((*me), Council[i]);
+ if (!member)
continue;
- if (!pMember->isAlive())
+ if (!member->isAlive())
{
- pMember->RemoveCorpse();
- pMember->Respawn();
+ member->RemoveCorpse();
+ member->Respawn();
}
- pMember->AI()->EnterEvadeMode();
+ member->AI()->EnterEvadeMode();
}
if (instance)
@@ -332,9 +332,9 @@ public:
return;
}
- Creature* pMember = (Unit::GetCreature(*me, Council[DeathCount]));
- if (pMember && pMember->isAlive())
- pMember->DealDamage(pMember, pMember->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+ Creature* member = (Unit::GetCreature(*me, Council[DeathCount]));
+ if (member && member->isAlive())
+ member->DealDamage(member, member->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
++DeathCount;
EndEventTimer = 1500;
} else EndEventTimer -= diff;