aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/Stratholme
diff options
context:
space:
mode:
authorBootz <Stage6Dev@EMPulseGaming.com>2011-10-07 19:45:43 -0500
committerBootz <Stage6Dev@EMPulseGaming.com>2011-10-07 19:45:43 -0500
commit5b4c7783c2a28e420cb4aaf4f2967083db8f6787 (patch)
tree887be454d8d9d1a916d8085a243a2afaff2c0dbe /src/server/scripts/EasternKingdoms/Stratholme
parentc89b1f6989ce1f5a48c48766993c3dd8101cc21b (diff)
REPO: Code-style clean-ups
* Fixed pMap->map * Fixed pInstance->instance * Fixed pInsta->instance * Fixed pQuest->quest * Fixed pWho->who * Fixed pTarget->target * Fixed pGo->go ~DEVNOTES: Handlers/QuestHandler.cpp still needs to be cleaned...
Diffstat (limited to 'src/server/scripts/EasternKingdoms/Stratholme')
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp16
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp30
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp20
7 files changed, 49 insertions, 49 deletions
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index 65f6e6fbf69..86cd3019fd8 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -91,10 +91,10 @@ public:
{
boss_baron_rivendareAI(Creature* c) : ScriptedAI(c)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 ShadowBolt_Timer;
uint32 Cleave_Timer;
@@ -109,14 +109,14 @@ public:
MortalStrike_Timer = 12000;
// RaiseDead_Timer = 30000;
SummonSkeletons_Timer = 34000;
- if (pInstance && pInstance->GetData(TYPE_RAMSTEIN) == DONE)
- pInstance->SetData(TYPE_BARON, NOT_STARTED);
+ if (instance && instance->GetData(TYPE_RAMSTEIN) == DONE)
+ instance->SetData(TYPE_BARON, NOT_STARTED);
}
void AttackStart(Unit* who)
{
- if (pInstance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door
- pInstance->SetData(TYPE_BARON, IN_PROGRESS);
+ if (instance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door
+ instance->SetData(TYPE_BARON, IN_PROGRESS);
ScriptedAI::AttackStart(who);
}
@@ -128,8 +128,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
- if (pInstance)
- pInstance->SetData(TYPE_BARON, DONE);
+ if (instance)
+ instance->SetData(TYPE_BARON, DONE);
}
void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
index bdd12326a8f..3cd6078eb41 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -45,10 +45,10 @@ public:
{
boss_baroness_anastariAI(Creature* c) : ScriptedAI(c)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 BansheeWail_Timer;
uint32 BansheeCurse_Timer;
@@ -69,8 +69,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
- if (pInstance)
- pInstance->SetData(TYPE_BARONESS, IN_PROGRESS);
+ if (instance)
+ instance->SetData(TYPE_BARONESS, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index 521348dd0db..cb423d9a781 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -45,10 +45,10 @@ public:
{
boss_maleki_the_pallidAI(Creature* c) : ScriptedAI(c)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 Frostbolt_Timer;
uint32 IceTomb_Timer;
@@ -67,8 +67,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
- if (pInstance)
- pInstance->SetData(TYPE_PALLID, IN_PROGRESS);
+ if (instance)
+ instance->SetData(TYPE_PALLID, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
index 34faab240f6..13ce7631be5 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -45,10 +45,10 @@ public:
{
boss_nerubenkanAI(Creature* c) : ScriptedAI(c)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 EncasingWebs_Timer;
uint32 PierceArmor_Timer;
@@ -69,8 +69,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
- if (pInstance)
- pInstance->SetData(TYPE_NERUB, IN_PROGRESS);
+ if (instance)
+ instance->SetData(TYPE_NERUB, IN_PROGRESS);
}
void RaiseUndeadScarab(Unit* victim)
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
index 980e8e41a6a..b93d289e0cc 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -56,10 +56,10 @@ public:
{
boss_silver_hand_bossesAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 HolyLight_Timer;
uint32 DivineShield_Timer;
@@ -69,24 +69,24 @@ public:
HolyLight_Timer = 20000;
DivineShield_Timer = 20000;
- if (pInstance)
+ if (instance)
{
switch (me->GetEntry())
{
case SH_AELMAR:
- pInstance->SetData(TYPE_SH_AELMAR, 0);
+ instance->SetData(TYPE_SH_AELMAR, 0);
break;
case SH_CATHELA:
- pInstance->SetData(TYPE_SH_CATHELA, 0);
+ instance->SetData(TYPE_SH_CATHELA, 0);
break;
case SH_GREGOR:
- pInstance->SetData(TYPE_SH_GREGOR, 0);
+ instance->SetData(TYPE_SH_GREGOR, 0);
break;
case SH_NEMAS:
- pInstance->SetData(TYPE_SH_NEMAS, 0);
+ instance->SetData(TYPE_SH_NEMAS, 0);
break;
case SH_VICAR:
- pInstance->SetData(TYPE_SH_VICAR, 0);
+ instance->SetData(TYPE_SH_VICAR, 0);
break;
}
}
@@ -98,27 +98,27 @@ public:
void JustDied(Unit* Killer)
{
- if (pInstance)
+ if (instance)
{
switch (me->GetEntry())
{
case SH_AELMAR:
- pInstance->SetData(TYPE_SH_AELMAR, 2);
+ instance->SetData(TYPE_SH_AELMAR, 2);
break;
case SH_CATHELA:
- pInstance->SetData(TYPE_SH_CATHELA, 2);
+ instance->SetData(TYPE_SH_CATHELA, 2);
break;
case SH_GREGOR:
- pInstance->SetData(TYPE_SH_GREGOR, 2);
+ instance->SetData(TYPE_SH_GREGOR, 2);
break;
case SH_NEMAS:
- pInstance->SetData(TYPE_SH_NEMAS, 2);
+ instance->SetData(TYPE_SH_NEMAS, 2);
break;
case SH_VICAR:
- pInstance->SetData(TYPE_SH_VICAR, 2);
+ instance->SetData(TYPE_SH_VICAR, 2);
break;
}
- if (pInstance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
+ if (instance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT, 0);
}
}
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
index aa9ba7b74b3..5d7e6c9467e 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -45,10 +45,10 @@ public:
{
boss_ramstein_the_gorgerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 Trample_Timer;
uint32 Knockout_Timer;
@@ -71,8 +71,8 @@ public:
mob->AI()->AttackStart(me->SelectNearestTarget(100.0f));
}
- if (pInstance)
- pInstance->SetData(TYPE_RAMSTEIN, DONE);
+ if (instance)
+ instance->SetData(TYPE_RAMSTEIN, DONE);
}
void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 2f8d333735f..39019c46850 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -19,7 +19,7 @@
/* ScriptData
SDName: Stratholme
SD%Complete: 100
-SDComment: Misc mobs for instance. pGo-script to apply aura and start event for quest 8945
+SDComment: Misc mobs for instance. go-script to apply aura and start event for quest 8945
SDCategory: Stratholme
EndScriptData */
@@ -43,14 +43,14 @@ class go_gauntlet_gate : public GameObjectScript
public:
go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { }
- bool OnGossipHello(Player* player, GameObject* pGo)
+ bool OnGossipHello(Player* player, GameObject* go)
{
- InstanceScript* pInstance = pGo->GetInstanceScript();
+ InstanceScript* instance = go->GetInstanceScript();
- if (!pInstance)
+ if (!instance)
return false;
- if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
+ if (instance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
return false;
if (Group* group = player->GetGroup())
@@ -63,15 +63,15 @@ public:
if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
!pGroupie->HasAura(SPELL_BARON_ULTIMATUM) &&
- pGroupie->GetMap() == pGo->GetMap())
+ pGroupie->GetMap() == go->GetMap())
pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true);
}
} else if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
!player->HasAura(SPELL_BARON_ULTIMATUM) &&
- player->GetMap() == pGo->GetMap())
+ player->GetMap() == go->GetMap())
player->CastSpell(player, SPELL_BARON_ULTIMATUM, true);
- pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS);
+ instance->SetData(TYPE_BARON_RUN, IN_PROGRESS);
return false;
}
@@ -177,9 +177,9 @@ public:
{
if (Die_Timer <= diff)
{
- if (Unit* pTemp = Unit::GetUnit(*me, Tagger))
+ if (Unit* temp = Unit::GetUnit(*me, Tagger))
{
- CAST_PLR(pTemp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID());
+ CAST_PLR(temp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID());
me->Kill(me);
}
} else Die_Timer -= diff;