aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
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/Northrend
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/Northrend')
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp20
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp16
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp16
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp2
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp20
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp26
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp100
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp42
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp2
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp170
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp6
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp24
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp14
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp122
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp6
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp82
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp38
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp70
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp52
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp68
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp58
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp2
-rwxr-xr-xsrc/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp358
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp46
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp34
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp16
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp12
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp12
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp12
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp30
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h10
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp6
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_eck.cpp26
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp16
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp16
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp20
-rw-r--r--src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp22
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp13
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp8
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp22
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp26
-rw-r--r--src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp6
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp30
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp16
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp22
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp6
-rw-r--r--src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp6
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp28
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp28
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp26
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp34
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp6
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp16
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp22
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp30
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp180
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp6
-rw-r--r--src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp26
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp28
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp28
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp56
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp6
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp28
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp148
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp26
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp44
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp48
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp6
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp20
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_erekem.cpp64
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp58
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp40
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_moragg.cpp40
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp54
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp40
-rw-r--r--src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp6
-rw-r--r--src/server/scripts/Northrend/VioletHold/violet_hold.cpp88
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp18
-rw-r--r--src/server/scripts/Northrend/howling_fjord.cpp4
-rw-r--r--src/server/scripts/Northrend/sholazar_basin.cpp4
-rw-r--r--src/server/scripts/Northrend/zuldrak.cpp32
82 files changed, 1518 insertions, 1519 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index efbc2c45e40..545dc79453d 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -93,10 +93,10 @@ public:
{
boss_anub_arakAI(Creature* c) : ScriptedAI(c), lSummons(me)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bChanneling;
bool bGuardianSummoned;
@@ -135,10 +135,10 @@ public:
lSummons.DespawnAll();
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED);
- pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
+ instance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED);
+ instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
}
@@ -162,10 +162,10 @@ public:
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS);
- pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
+ instance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS);
+ instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
}
@@ -329,8 +329,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
lSummons.DespawnAll();
- if (pInstance)
- pInstance->SetData(DATA_ANUBARAK_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_ANUBARAK_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index afb04ace085..dea3d6eaede 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -53,12 +53,12 @@ public:
{
boss_hadronoxAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
fMaxDistance = 50.0f;
bFirstTime = true;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiAcidTimer;
uint32 uiLeechTimer;
@@ -83,8 +83,8 @@ public:
uiDoorsTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS);
uiCheckDistanceTimer = 2*IN_MILLISECONDS;
- if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime))
- pInstance->SetData(DATA_HADRONOX_EVENT, FAIL);
+ if (instance && (instance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime))
+ instance->SetData(DATA_HADRONOX_EVENT, FAIL);
bFirstTime = false;
}
@@ -101,14 +101,14 @@ public:
void JustDied(Unit* /*Killer*/)
{
- if (pInstance)
- pInstance->SetData(DATA_HADRONOX_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_HADRONOX_EVENT, DONE);
}
void EnterCombat(Unit* /*who*/)
{
- if (pInstance)
- pInstance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS);
me->SetInCombatWithZone();
}
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 42d03f05e51..6a734035005 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -96,10 +96,10 @@ public:
{
boss_krik_thirAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiMindFlayTimer;
uint32 uiCurseFatigueTimer;
@@ -110,8 +110,8 @@ public:
uiMindFlayTimer = 15*IN_MILLISECONDS;
uiCurseFatigueTimer = 12*IN_MILLISECONDS;
- if (pInstance)
- pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -120,8 +120,8 @@ public:
Summon();
uiSummonTimer = 15*IN_MILLISECONDS;
- if (pInstance)
- pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS);
}
void Summon()
@@ -181,8 +181,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
index 4ea135a2294..6b8299e6c4b 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -33,7 +33,7 @@ public:
struct instance_azjol_nerub_InstanceScript : public InstanceScript
{
- instance_azjol_nerub_InstanceScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_azjol_nerub_InstanceScript(Map* map) : InstanceScript(map) {}
uint64 uiKrikthir;
uint64 uiHadronox;
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
index 03279579098..cde97f8d37b 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
@@ -50,11 +50,11 @@ public:
{
boss_amanitarAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
bFirstTime = true;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiRootTimer;
uint32 uiBashTimer;
@@ -73,11 +73,11 @@ public:
me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE);
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
- if (pInstance)
+ if (instance)
{
- pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
+ instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
if (!bFirstTime)
- pInstance->SetData(DATA_AMANITAR_EVENT, FAIL);
+ instance->SetData(DATA_AMANITAR_EVENT, FAIL);
else
bFirstTime = false;
}
@@ -85,17 +85,17 @@ public:
void JustDied(Unit* /*Killer*/)
{
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_AMANITAR_EVENT, DONE);
- pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
+ instance->SetData(DATA_AMANITAR_EVENT, DONE);
+ instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
}
}
void EnterCombat(Unit* /*who*/)
{
- if (pInstance)
- pInstance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS);
DoCast(me, SPELL_MINI, false);
}
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
index ea8771ab635..bc4d4ba5eea 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
@@ -69,10 +69,10 @@ public:
{
boss_volazjAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiMindFlayTimer;
uint32 uiShadowBoltVolleyTimer;
@@ -155,10 +155,10 @@ public:
uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS;
uiShiverTimer = 15*IN_MILLISECONDS;
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_HERALD_VOLAZJ, NOT_STARTED);
- pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT);
+ instance->SetData(DATA_HERALD_VOLAZJ, NOT_STARTED);
+ instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT);
}
// Visible for all players in insanity
@@ -178,10 +178,10 @@ public:
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_HERALD_VOLAZJ, IN_PROGRESS);
- pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT);
+ instance->SetData(DATA_HERALD_VOLAZJ, IN_PROGRESS);
+ instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT);
}
}
@@ -236,11 +236,11 @@ public:
// Roll Insanity
uint32 spell = GetSpellForPhaseMask(phase);
uint32 spell2 = GetSpellForPhaseMask(nextPhase);
- Map* pMap = me->GetMap();
- if (!pMap)
+ Map* map = me->GetMap();
+ if (!map)
return;
- Map::PlayerList const &PlayerList = pMap->GetPlayers();
+ Map::PlayerList const &PlayerList = map->GetPlayers();
if (!PlayerList.isEmpty())
{
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
@@ -301,8 +301,8 @@ public:
{
DoScriptText(SAY_DEATH_1, me);
- if (pInstance)
- pInstance->SetData(DATA_HERALD_VOLAZJ, DONE);
+ if (instance)
+ instance->SetData(DATA_HERALD_VOLAZJ, DONE);
Summons.DespawnAll();
ResetPlayersPhaseMask();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index 05b8881a322..b2975797a02 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -75,12 +75,12 @@ public:
{
boss_jedoga_shadowseekerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
bFirstTime = true;
bPreDone = false;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiOpFerTimer;
uint32 uiCycloneTimer;
@@ -109,14 +109,14 @@ public:
bCanDown = false;
volunteerWork = true;
- if (pInstance)
+ if (instance)
{
if (!bFirstTime)
- pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, FAIL);
+ instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, FAIL);
- pInstance->SetData64(DATA_PL_JEDOGA_TARGET, 0);
- pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, 0);
- pInstance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0);
+ instance->SetData64(DATA_PL_JEDOGA_TARGET, 0);
+ instance->SetData64(DATA_ADD_JEDOGA_OPFER, 0);
+ instance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0);
}
MoveUp();
@@ -125,12 +125,12 @@ public:
void EnterCombat(Unit* who)
{
- if (!pInstance || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER))
+ if (!instance || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER))
return;
DoScriptText(TEXT_AGGRO, me);
me->SetInCombatWithZone();
- pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, IN_PROGRESS);
+ instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, IN_PROGRESS);
}
void AttackStart(Unit* who)
@@ -152,8 +152,8 @@ public:
void JustDied(Unit* /*Killer*/)
{
DoScriptText(TEXT_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE);
}
void DoAction(int32 const action)
@@ -172,7 +172,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
- if (!pInstance || !who || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER))
+ if (!instance || !who || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER))
return;
if (!bPreDone && who->GetTypeId() == TYPEID_PLAYER && me->GetDistance(who) < 100.0f)
@@ -181,7 +181,7 @@ public:
bPreDone = true;
}
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround)
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround)
return;
if (!me->getVictim() && me->canCreatureAttack(who))
@@ -205,12 +205,12 @@ public:
void MoveDown()
{
- if (!pInstance)
+ if (!instance)
return;
bOpFerokFail = false;
- pInstance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 0);
+ instance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 0);
me->GetMotionMaster()->MovePoint(1, JedogaPosition[1]);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, false);
@@ -227,11 +227,11 @@ public:
}
else
{
- if (Unit* target = Unit::GetUnit(*me, pInstance->GetData64(DATA_PL_JEDOGA_TARGET)))
+ if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_PL_JEDOGA_TARGET)))
{
AttackStart(target);
- pInstance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0);
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS)
+ instance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0);
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS)
EnterCombat(target);
}
else if (!me->isInCombat())
@@ -241,7 +241,7 @@ public:
void MoveUp()
{
- if (!pInstance)
+ if (!instance)
return;
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true);
@@ -253,8 +253,8 @@ public:
me->LoadCreaturesAddon();
me->GetMotionMaster()->MovePoint(0, JedogaPosition[0]);
- pInstance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 1);
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen();
+ instance->SetData(DATA_JEDOGA_TRIGGER_SWITCH, 1);
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen();
bOnGround = false;
uiOpFerTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS);
@@ -262,15 +262,15 @@ public:
void OpferRufen()
{
- if (!pInstance)
+ if (!instance)
return;
- uint64 opfer = pInstance->GetData64(DATA_ADD_JEDOGA_INITIAND);
+ uint64 opfer = instance->GetData64(DATA_ADD_JEDOGA_INITIAND);
if (opfer)
{
DoScriptText(RAND(TEXT_SACRIFICE_1_1, TEXT_SACRIFICE_1_2), me);
- pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, opfer);
+ instance->SetData64(DATA_ADD_JEDOGA_OPFER, opfer);
} else
bCanDown = true;
}
@@ -288,10 +288,10 @@ public:
void UpdateAI(const uint32 diff)
{
- if (!pInstance)
+ if (!instance)
return;
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && pInstance->GetData(DATA_ALL_INITIAND_DEAD))
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && instance->GetData(DATA_ALL_INITIAND_DEAD))
MoveDown();
if (bOpFerok && !bOnGround && !bCanDown) Opfern();
@@ -357,10 +357,10 @@ public:
{
mob_jedoga_initiandAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 bCheckTimer;
@@ -368,13 +368,13 @@ public:
void Reset()
{
- if (!pInstance)
+ if (!instance)
return;
bWalking = false;
bCheckTimer = 2*IN_MILLISECONDS;
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS)
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS)
{
me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false);
@@ -392,12 +392,12 @@ public:
void JustDied(Unit* Killer)
{
- if (!Killer || !pInstance)
+ if (!Killer || !instance)
return;
if (bWalking)
{
- if (Creature* boss = ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_JEDOGA_SHADOWSEEKER)))
+ if (Creature* boss = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_JEDOGA_SHADOWSEEKER)))
{
if (!CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok)
CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerokFail = true;
@@ -405,23 +405,23 @@ public:
boss->AI()->DoAction(ACTION_INITIAND_KILLED);
}
- pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, 0);
+ instance->SetData64(DATA_ADD_JEDOGA_OPFER, 0);
bWalking = false;
}
if (Killer->GetTypeId() == TYPEID_PLAYER)
- pInstance->SetData64(DATA_PL_JEDOGA_TARGET, Killer->GetGUID());
+ instance->SetData64(DATA_PL_JEDOGA_TARGET, Killer->GetGUID());
}
void EnterCombat(Unit* who)
{
- if ((pInstance && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who)
+ if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who)
return;
}
void AttackStart(Unit* victim)
{
- if ((pInstance && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !victim)
+ if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !victim)
return;
ScriptedAI::AttackStart(victim);
@@ -429,7 +429,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
- if ((pInstance && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who)
+ if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who)
return;
ScriptedAI::MoveInLineOfSight(who);
@@ -437,14 +437,14 @@ public:
void MovementInform(uint32 uiType, uint32 uiPointId)
{
- if (uiType != POINT_MOTION_TYPE || !pInstance)
+ if (uiType != POINT_MOTION_TYPE || !instance)
return;
switch (uiPointId)
{
case 1:
{
- Creature* boss = me->GetMap()->GetCreature(pInstance->GetData64(DATA_JEDOGA_SHADOWSEEKER));
+ Creature* boss = me->GetMap()->GetCreature(instance->GetData64(DATA_JEDOGA_SHADOWSEEKER));
if (boss)
{
CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok = true;
@@ -458,9 +458,9 @@ public:
void UpdateAI(const uint32 diff)
{
- if (pInstance && bCheckTimer <= diff)
+ if (instance && bCheckTimer <= diff)
{
- if (me->GetGUID() == pInstance->GetData64(DATA_ADD_JEDOGA_OPFER) && !bWalking)
+ if (me->GetGUID() == instance->GetData64(DATA_ADD_JEDOGA_OPFER) && !bWalking)
{
me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false);
@@ -482,14 +482,14 @@ public:
}
if (!bWalking)
{
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && me->HasAura(SPELL_SPHERE_VISUAL))
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS && me->HasAura(SPELL_SPHERE_VISUAL))
{
me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, false);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE);
}
- if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS && !me->HasAura(SPELL_SPHERE_VISUAL))
+ if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS && !me->HasAura(SPELL_SPHERE_VISUAL))
{
DoCast(me, SPELL_SPHERE_VISUAL, false);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true);
@@ -532,14 +532,14 @@ public:
{
npc_jedogas_aufseher_triggerAI(Creature* c) : Scripted_NoMovementAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
bRemoved = false;
bRemoved2 = false;
bCasted = false;
bCasted2 = false;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bRemoved;
bool bRemoved2;
@@ -553,12 +553,12 @@ public:
void UpdateAI(const uint32 /*diff*/)
{
- if (!pInstance)
+ if (!instance)
return;
if (!bRemoved && me->GetPositionX() > 440.0f)
{
- if (pInstance->GetData(DATA_PRINCE_TALDARAM_EVENT) == DONE)
+ if (instance->GetData(DATA_PRINCE_TALDARAM_EVENT) == DONE)
{
me->InterruptNonMeleeSpells(true);
bRemoved = true;
@@ -572,17 +572,17 @@ public:
}
if (!bRemoved2 && me->GetPositionX() < 440.0f)
{
- if (!bCasted2 && pInstance->GetData(DATA_JEDOGA_TRIGGER_SWITCH))
+ if (!bCasted2 && instance->GetData(DATA_JEDOGA_TRIGGER_SWITCH))
{
DoCast(me, SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_2, false);
bCasted2 = true;
}
- if (bCasted2 && !pInstance->GetData(DATA_JEDOGA_TRIGGER_SWITCH))
+ if (bCasted2 && !instance->GetData(DATA_JEDOGA_TRIGGER_SWITCH))
{
me->InterruptNonMeleeSpells(true);
bCasted2 = false;
}
- if (!bRemoved2 && pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == DONE)
+ if (!bRemoved2 && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == DONE)
{
me->InterruptNonMeleeSpells(true);
bRemoved2 = true;
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
index c22a5489358..9a7dc2f2cc9 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
@@ -81,7 +81,7 @@ public:
{
boss_taldaramAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@@ -98,7 +98,7 @@ public:
CombatPhase Phase;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -110,14 +110,14 @@ public:
Phase = NORMAL;
uiPhaseTimer = 0;
uiEmbraceTarget = 0;
- if (pInstance)
- pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
- if (pInstance)
- pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS);
DoScriptText(SAY_AGGRO, me);
}
@@ -262,8 +262,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE);
}
void KilledUnit(Unit* victim)
@@ -283,16 +283,16 @@ public:
bool CheckSpheres()
{
- if (!pInstance)
+ if (!instance)
return false;
uint64 uiSphereGuids[2];
- uiSphereGuids[0] = pInstance->GetData64(DATA_SPHERE1);
- uiSphereGuids[1] = pInstance->GetData64(DATA_SPHERE2);
+ uiSphereGuids[0] = instance->GetData64(DATA_SPHERE1);
+ uiSphereGuids[1] = instance->GetData64(DATA_SPHERE2);
for (uint8 i=0; i < 2; ++i)
{
- GameObject* pSpheres = pInstance->instance->GetGameObject(uiSphereGuids[i]);
+ GameObject* pSpheres = instance->instance->GetGameObject(uiSphereGuids[i]);
if (!pSpheres)
return false;
if (pSpheres->GetGoState() != GO_STATE_ACTIVE)
@@ -312,7 +312,7 @@ public:
void RemovePrison()
{
- if (!pInstance)
+ if (!instance)
return;
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -320,8 +320,8 @@ public:
me->RemoveAurasDueToSpell(SPELL_BEAM_VISUAL);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation());
- uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM);
- pInstance->HandleGameObject(prison_GUID, true);
+ uint64 prison_GUID = instance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM);
+ instance->HandleGameObject(prison_GUID, true);
}
};
@@ -340,11 +340,11 @@ public:
{
mob_taldaram_flamesphereAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiDespawnTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -388,9 +388,9 @@ public:
bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{
- InstanceScript* pInstance = pGO->GetInstanceScript();
+ InstanceScript* instance = pGO->GetInstanceScript();
- Creature* pPrinceTaldaram = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_PRINCE_TALDARAM) : 0);
+ Creature* pPrinceTaldaram = Unit::GetCreature(*pGO, instance ? instance->GetData64(DATA_PRINCE_TALDARAM) : 0);
if (pPrinceTaldaram && pPrinceTaldaram->isAlive())
{
// maybe these are hacks :(
@@ -399,8 +399,8 @@ public:
switch (pGO->GetEntry())
{
- case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break;
- case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break;
+ case GO_SPHERE1: instance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break;
+ case GO_SPHERE2: instance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break;
}
CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
index e7c4b517cbf..5ba11dd5353 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
@@ -40,7 +40,7 @@ public:
struct instance_ahnkahet_InstanceScript : public InstanceScript
{
- instance_ahnkahet_InstanceScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_ahnkahet_InstanceScript(Map* map) : InstanceScript(map) {}
uint64 Elder_Nadox;
uint64 Prince_Taldaram;
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index 2a1c0bd6e91..187d82887e7 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -225,10 +225,10 @@ public:
{
boss_sartharionAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool m_bIsBerserk;
bool m_bIsSoftEnraged;
@@ -282,11 +282,11 @@ public:
drakeCount = 0;
// Drakes respawning system
- if (pInstance)
+ if (instance)
{
- Creature* pTenebron = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON));
- Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
- Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
+ Creature* pTenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON));
+ Creature* pShadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON));
+ Creature* pVesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON));
if (pTenebron)
{
pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f);
@@ -297,7 +297,7 @@ public:
pTenebron->GetMotionMaster()->MoveTargetedHome();
}else
{
- if (pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false)
+ if (instance->GetData(TYPE_TENEBRON_PREKILLED) == false)
{
pTenebron->Respawn();
pTenebron->GetMotionMaster()->MoveTargetedHome();
@@ -315,7 +315,7 @@ public:
pShadron->GetMotionMaster()->MoveTargetedHome();
}else
{
- if (pInstance->GetData(TYPE_SHADRON_PREKILLED) == false)
+ if (instance->GetData(TYPE_SHADRON_PREKILLED) == false)
{
pShadron->Respawn();
pShadron->GetMotionMaster()->MoveTargetedHome();
@@ -333,7 +333,7 @@ public:
pVesperon->GetMotionMaster()->MoveTargetedHome();
}else
{
- if (pInstance->GetData(TYPE_VESPERON_PREKILLED) == false)
+ if (instance->GetData(TYPE_VESPERON_PREKILLED) == false)
{
pVesperon->Respawn();
pVesperon->GetMotionMaster()->MoveTargetedHome();
@@ -346,8 +346,8 @@ public:
void JustReachedHome()
{
- if (pInstance)
- pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -355,9 +355,9 @@ public:
DoScriptText(SAY_SARTHARION_AGGRO, me);
DoZoneInCombat();
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(TYPE_SARTHARION_EVENT, IN_PROGRESS);
+ instance->SetData(TYPE_SARTHARION_EVENT, IN_PROGRESS);
FetchDragons();
}
}
@@ -366,11 +366,11 @@ public:
{
DoScriptText(SAY_SARTHARION_DEATH, me);
- if (pInstance)
+ if (instance)
{
- Creature* pTenebron = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON));
- Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
- Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
+ Creature* pTenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON));
+ Creature* pShadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON));
+ Creature* pVesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON));
if (pTenebron && pTenebron->isAlive())
pTenebron->DisappearAndDie();
if (pShadron && pShadron->isAlive())
@@ -378,7 +378,7 @@ public:
if (pVesperon && pVesperon->isAlive())
pVesperon->DisappearAndDie();
- pInstance->SetData(TYPE_SARTHARION_EVENT, DONE);
+ instance->SetData(TYPE_SARTHARION_EVENT, DONE);
}
}
@@ -409,15 +409,15 @@ public:
void FetchDragons()
{
- if (!pInstance)
+ if (!instance)
return;
me->ResetLootMode();
drakeCount = 0;
- Creature* pFetchTene = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON));
- Creature* pFetchShad = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
- Creature* pFetchVesp = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
+ Creature* pFetchTene = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON));
+ Creature* pFetchShad = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON));
+ Creature* pFetchVesp = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON));
//if at least one of the dragons are alive and are being called
bool bCanUseWill = false;
@@ -470,36 +470,36 @@ public:
void CallDragon(uint32 uiDataId)
{
- if (pInstance)
+ if (instance)
{
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId)))
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(uiDataId)))
{
- if (pTemp->isAlive() && !pTemp->getVictim())
+ if (temp->isAlive() && !temp->getVictim())
{
- if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING))
- pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
+ if (temp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING))
+ temp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
- if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
- pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+ if (temp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+ temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
int32 iTextId = 0;
- switch (pTemp->GetEntry())
+ switch (temp->GetEntry())
{
case NPC_TENEBRON:
iTextId = SAY_SARTHARION_CALL_TENEBRON;
- pTemp->AddAura(SPELL_POWER_OF_TENEBRON, pTemp);
- pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aTene[1].m_fX, m_aTene[1].m_fY, m_aTene[1].m_fZ);
+ temp->AddAura(SPELL_POWER_OF_TENEBRON, temp);
+ temp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aTene[1].m_fX, m_aTene[1].m_fY, m_aTene[1].m_fZ);
break;
case NPC_SHADRON:
iTextId = SAY_SARTHARION_CALL_SHADRON;
- pTemp->AddAura(SPELL_POWER_OF_SHADRON, pTemp);
- pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aShad[1].m_fX, m_aShad[1].m_fY, m_aShad[1].m_fZ);
+ temp->AddAura(SPELL_POWER_OF_SHADRON, temp);
+ temp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aShad[1].m_fX, m_aShad[1].m_fY, m_aShad[1].m_fZ);
break;
case NPC_VESPERON:
iTextId = SAY_SARTHARION_CALL_VESPERON;
- pTemp->AddAura(SPELL_POWER_OF_VESPERON, pTemp);
- pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aVesp[1].m_fX, m_aVesp[1].m_fY, m_aVesp[1].m_fZ);
+ temp->AddAura(SPELL_POWER_OF_VESPERON, temp);
+ temp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aVesp[1].m_fX, m_aVesp[1].m_fY, m_aVesp[1].m_fZ);
break;
}
@@ -511,10 +511,10 @@ public:
void SendFlameTsunami()
{
- if (Map* pMap = me->GetMap())
- if (pMap->IsDungeon())
+ if (Map* map = me->GetMap())
+ if (map->IsDungeon())
{
- Map::PlayerList const &PlayerList = pMap->GetPlayers();
+ Map::PlayerList const &PlayerList = map->GetPlayers();
if (!PlayerList.isEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
@@ -550,9 +550,9 @@ public:
if (!UpdateVictim())
return;
- Unit* pTene = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_TENEBRON) : 0);
- Unit* pShad = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_SHADRON) : 0);
- Unit* pVesp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_VESPERON) : 0);
+ Unit* pTene = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_TENEBRON) : 0);
+ Unit* pShad = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_SHADRON) : 0);
+ Unit* pVesp = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_VESPERON) : 0);
//spell will target dragons, if they are still alive at 35%
if (!m_bIsBerserk && !HealthAbovePct(35)
@@ -732,10 +732,10 @@ struct dummy_dragonAI : public ScriptedAI
{
dummy_dragonAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 m_uiWaypointId;
uint32 m_uiMoveNextTimer;
@@ -763,13 +763,13 @@ struct dummy_dragonAI : public ScriptedAI
void MovementInform(uint32 uiType, uint32 uiPointId)
{
- if (!pInstance || uiType != POINT_MOTION_TYPE)
+ if (!instance || uiType != POINT_MOTION_TYPE)
return;
// debug_log("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
//if healers messed up the raid and we was already initialized
- if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+ if (instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
{
EnterEvadeMode();
return;
@@ -812,11 +812,11 @@ struct dummy_dragonAI : public ScriptedAI
//used when open portal and spawn mobs in phase
void DoRaidWhisper(int32 iTextId)
{
- Map* pMap = me->GetMap();
+ Map* map = me->GetMap();
- if (pMap && pMap->IsDungeon())
+ if (map && map->IsDungeon())
{
- Map::PlayerList const &PlayerList = pMap->GetPlayers();
+ Map::PlayerList const &PlayerList = map->GetPlayers();
if (!PlayerList.isEmpty())
{
@@ -842,7 +842,7 @@ struct dummy_dragonAI : public ScriptedAI
case NPC_TENEBRON:
{
iTextId = WHISPER_HATCH_EGGS;
- if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+ if (instance && !instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
{
for (uint32 i = 0; i < 6; ++i)
me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
@@ -857,7 +857,7 @@ struct dummy_dragonAI : public ScriptedAI
case NPC_SHADRON:
{
iTextId = WHISPER_OPEN_PORTAL;
- if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+ if (instance && !instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y, AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000);
else
me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y, AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000);
@@ -867,7 +867,7 @@ struct dummy_dragonAI : public ScriptedAI
case NPC_VESPERON:
{
iTextId = WHISPER_OPEN_PORTAL;
- if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+ if (instance && !instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
{
if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y, AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000))
{
@@ -914,14 +914,14 @@ struct dummy_dragonAI : public ScriptedAI
case NPC_TENEBRON:
iTextId = SAY_TENEBRON_DEATH;
uiSpellId = SPELL_POWER_OF_TENEBRON;
- if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
- pInstance->SetData(TYPE_TENEBRON_PREKILLED, 1);
+ if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+ instance->SetData(TYPE_TENEBRON_PREKILLED, 1);
break;
case NPC_SHADRON:
iTextId = SAY_SHADRON_DEATH;
uiSpellId = SPELL_POWER_OF_SHADRON;
- if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
- pInstance->SetData(TYPE_SHADRON_PREKILLED, 1);
+ if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+ instance->SetData(TYPE_SHADRON_PREKILLED, 1);
if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f))
{
pAcolyte->Kill(pAcolyte);
@@ -930,8 +930,8 @@ struct dummy_dragonAI : public ScriptedAI
case NPC_VESPERON:
iTextId = SAY_VESPERON_DEATH;
uiSpellId = SPELL_POWER_OF_VESPERON;
- if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
- pInstance->SetData(TYPE_VESPERON_PREKILLED, 1);
+ if (instance && instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+ instance->SetData(TYPE_VESPERON_PREKILLED, 1);
if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f))
{
pAcolyte->Kill(pAcolyte);
@@ -943,16 +943,16 @@ struct dummy_dragonAI : public ScriptedAI
me->RemoveAurasDueToSpell(uiSpellId);
- if (pInstance)
+ if (instance)
{
- pInstance->DoRemoveAurasDueToSpellOnPlayers(uiSpellId);
+ instance->DoRemoveAurasDueToSpellOnPlayers(uiSpellId);
// not if solo mini-boss fight
- if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+ if (instance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
return;
// Twilight Revenge to main boss
- if (Unit* pSartharion = Unit::GetUnit((*me), pInstance->GetData64(DATA_SARTHARION)))
+ if (Unit* pSartharion = Unit::GetUnit((*me), instance->GetData64(DATA_SARTHARION)))
if (pSartharion->isAlive())
{
pSartharion->RemoveAurasDueToSpell(uiSpellId);
@@ -1289,28 +1289,28 @@ public:
{
mob_acolyte_of_shadronAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiDespawnTimer;
void Reset()
{
uiDespawnTimer = 28000;
- if (pInstance)
+ if (instance)
{
Creature* target = NULL;
//if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
- if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+ if (instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
{
- target = Unit::GetCreature((*me), pInstance->GetData64(DATA_SARTHARION));
+ target = Unit::GetCreature((*me), instance->GetData64(DATA_SARTHARION));
if (target)
target->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, target);
}
else
{
- target = Unit::GetCreature((*me), pInstance->GetData64(DATA_SHADRON));
+ target = Unit::GetCreature((*me), instance->GetData64(DATA_SHADRON));
if (target)
target->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, target);
}
@@ -1321,9 +1321,9 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON));
+ Creature* Shadron = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON));
if (Shadron)
{
(CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false;
@@ -1351,12 +1351,12 @@ public:
}
//not solo fight, so main boss has deduff
- pDebuffTarget = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SARTHARION));
+ pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SARTHARION));
if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR))
pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR);
//event not in progress, then solo fight and must remove debuff mini-boss
- pDebuffTarget = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON));
+ pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON));
if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
}
@@ -1399,16 +1399,16 @@ public:
{
mob_acolyte_of_vesperonAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiDespawnTimer;
void Reset()
{
uiDespawnTimer = 28000;
- if (pInstance)
+ if (instance)
{
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
}
@@ -1420,9 +1420,9 @@ public:
me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO);
// remove twilight torment on Vesperon
- if (pInstance)
+ if (instance)
{
- Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON));
+ Creature* pVesperon = instance->instance->GetCreature(instance->GetData64(DATA_VESPERON));
if (pVesperon)
(CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false;
@@ -1451,9 +1451,9 @@ public:
}
}
- pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_TWILIGHT_TORMENT_VESP_ACO);
- pInstance->DoRemoveAurasDueToSpellOnPlayers(57935);
- pInstance->DoRemoveAurasDueToSpellOnPlayers(58835); // Components of spell Twilight Torment
+ instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_TWILIGHT_TORMENT_VESP_ACO);
+ instance->DoRemoveAurasDueToSpellOnPlayers(57935);
+ instance->DoRemoveAurasDueToSpellOnPlayers(58835); // Components of spell Twilight Torment
}
}
@@ -1494,17 +1494,17 @@ public:
{
mob_twilight_eggsAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 m_uiFadeArmorTimer;
uint32 m_uiHatchEggTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
- if (pInstance)
+ if (instance)
{
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
}
@@ -1516,7 +1516,7 @@ public:
{
me->RemoveAllAuras();
- if (!pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+ if (!instance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
me->SummonCreature(NPC_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
else
me->SummonCreature(NPC_SHARTHARION_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
@@ -1532,7 +1532,7 @@ public:
{
if (m_uiHatchEggTimer <= uiDiff)
{
- Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON));
+ Creature* Tenebron = instance->instance->GetCreature(instance->GetData64(DATA_TENEBRON));
if (Tenebron)
(CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false;
SpawnWhelps();
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
index 671c6b8b6d1..fa685421141 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -29,14 +29,14 @@ class instance_obsidian_sanctum : public InstanceMapScript
public:
instance_obsidian_sanctum() : InstanceMapScript("instance_obsidian_sanctum", 615) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_obsidian_sanctum_InstanceMapScript(pMap);
+ return new instance_obsidian_sanctum_InstanceMapScript(map);
}
struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript
{
- instance_obsidian_sanctum_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 m_uiSartharionGUID;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index 80a94b5b4fc..e46dc3d741a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -102,12 +102,12 @@ public:
{
boss_eadricAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
creature->SetReactState(REACT_PASSIVE);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiVenganceTimer;
uint32 uiRadianceTimer;
@@ -142,8 +142,8 @@ public:
if (MovementType != POINT_MOTION_TYPE)
return;
- if (pInstance)
- pInstance->SetData(BOSS_ARGENT_CHALLENGE_E, DONE);
+ if (instance)
+ instance->SetData(BOSS_ARGENT_CHALLENGE_E, DONE);
me->DisappearAndDie();
}
@@ -207,7 +207,7 @@ public:
{
boss_paletressAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
MemoryGUID = 0;
creature->SetReactState(REACT_PASSIVE);
@@ -215,7 +215,7 @@ public:
creature->RestoreFaction();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
Creature* pMemory;
uint64 MemoryGUID;
@@ -268,8 +268,8 @@ public:
if (MovementType != POINT_MOTION_TYPE || Point != 0)
return;
- if (pInstance)
- pInstance->SetData(BOSS_ARGENT_CHALLENGE_P, DONE);
+ if (instance)
+ instance->SetData(BOSS_ARGENT_CHALLENGE_P, DONE);
me->DisappearAndDie();
}
@@ -437,13 +437,13 @@ public:
{
npc_argent_soldierAI(Creature* creature) : npc_escortAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
me->SetReactState(REACT_DEFENSIVE);
SetDespawnAtEnd(false);
uiWaypoint = 0;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiWaypoint;
@@ -532,8 +532,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1);
+ if (instance)
+ instance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, instance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1);
}
};
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index 55cfef0f160..fd84c1eec8a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -80,10 +80,10 @@ public:
{
boss_black_knightAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
std::list<uint64> SummonList;
@@ -137,9 +137,9 @@ public:
for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
- if (pTemp)
- pTemp->DisappearAndDie();
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
+ if (temp)
+ temp->DisappearAndDie();
}
SummonList.clear();
}
@@ -288,8 +288,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(BOSS_BLACK_KNIGHT, DONE);
+ if (instance)
+ instance->SetData(BOSS_BLACK_KNIGHT, DONE);
}
};
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index 50cd81ba1c7..2fbe381fed5 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -91,9 +91,9 @@ const Point MovementPoint[] =
{750.23f, 618.35f, 411.09f}
};
*/
-void AggroAllPlayers(Creature* pTemp)
+void AggroAllPlayers(Creature* temp)
{
- Map::PlayerList const &PlList = pTemp->GetMap()->GetPlayers();
+ Map::PlayerList const &PlList = temp->GetMap()->GetPlayers();
if (PlList.isEmpty())
return;
@@ -107,11 +107,11 @@ void AggroAllPlayers(Creature* pTemp)
if (player->isAlive())
{
- pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
- pTemp->SetReactState(REACT_AGGRESSIVE);
- pTemp->SetInCombatWith(player);
- player->SetInCombatWith(pTemp);
- pTemp->AddThreat(player, 0.0f);
+ temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+ temp->SetReactState(REACT_AGGRESSIVE);
+ temp->SetInCombatWith(player);
+ player->SetInCombatWith(temp);
+ temp->AddThreat(player, 0.0f);
}
}
}
@@ -119,14 +119,14 @@ void AggroAllPlayers(Creature* pTemp)
bool GrandChampionsOutVehicle(Creature* me)
{
- InstanceScript* pInstance = me->GetInstanceScript();
+ InstanceScript* instance = me->GetInstanceScript();
- if (!pInstance)
+ if (!instance)
return false;
- Creature* pGrandChampion1 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_1));
- Creature* pGrandChampion2 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_2));
- Creature* pGrandChampion3 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_3));
+ Creature* pGrandChampion1 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_1));
+ Creature* pGrandChampion2 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_2));
+ Creature* pGrandChampion3 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_3));
if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3)
{
@@ -156,10 +156,10 @@ public:
SetDespawnAtEnd(false);
uiWaypointPath = 0;
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiChargeTimer;
uint32 uiShieldBreakerTimer;
@@ -208,12 +208,12 @@ public:
switch (i)
{
case 2:
- if ((pInstance && uiWaypointPath == 3) || uiWaypointPath == 2)
- pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1);
+ if ((instance && uiWaypointPath == 3) || uiWaypointPath == 2)
+ instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1);
break;
case 3:
- if (pInstance)
- pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1);
+ if (instance)
+ instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1);
break;
}
}
@@ -310,7 +310,7 @@ public:
{
boss_warrior_toc5AI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bDone = false;
bHome = false;
@@ -323,7 +323,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiPhase;
uint32 uiPhaseTimer;
@@ -362,11 +362,11 @@ public:
{
bDone = true;
- if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1))
+ if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
EnterEvadeMode();
@@ -422,8 +422,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
}
};
@@ -443,7 +443,7 @@ public:
{
boss_mage_toc5AI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bDone = false;
bHome = false;
@@ -456,7 +456,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiPhase;
uint32 uiPhaseTimer;
@@ -496,15 +496,15 @@ public:
{
bDone = true;
- if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1))
+ if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
EnterEvadeMode();
bHome = true;
@@ -561,8 +561,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
}
};
@@ -582,7 +582,7 @@ public:
{
boss_shaman_toc5AI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bDone = false;
bHome = false;
@@ -595,7 +595,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiPhase;
uint32 uiPhaseTimer;
@@ -641,15 +641,15 @@ public:
{
bDone = true;
- if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1))
+ if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
EnterEvadeMode();
bHome = true;
@@ -708,8 +708,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
}
};
@@ -729,7 +729,7 @@ public:
{
boss_hunter_toc5AI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bDone = false;
bHome = false;
@@ -742,7 +742,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiPhase;
uint32 uiPhaseTimer;
@@ -787,15 +787,15 @@ public:
{
bDone = true;
- if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1))
+ if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
EnterEvadeMode();
bHome = true;
@@ -863,8 +863,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
}
};
@@ -884,7 +884,7 @@ public:
{
boss_rouge_toc5AI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bDone = false;
bHome = false;
@@ -897,7 +897,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiPhase;
uint32 uiPhaseTimer;
@@ -934,15 +934,15 @@ public:
{
bDone = true;
- if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1))
+ if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_1))
me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_2))
me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f);
- else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3))
+ else if (instance && me->GetGUID() == instance->GetData64(DATA_GRAND_CHAMPION_3))
me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f);
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS);
EnterEvadeMode();
bHome = true;
@@ -984,8 +984,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
+ if (instance)
+ instance->SetData(BOSS_GRAND_CHAMPIONS, DONE);
}
};
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
index 415a82651ac..1f3db4c4976 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -31,14 +31,14 @@ class instance_trial_of_the_champion : public InstanceMapScript
public:
instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", 650) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_trial_of_the_champion_InstanceMapScript(pMap);
+ return new instance_trial_of_the_champion_InstanceMapScript(map);
}
struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript
{
- instance_trial_of_the_champion_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_trial_of_the_champion_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index acbe54d0acd..2688005ee22 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -50,7 +50,7 @@ public:
{
npc_announcer_toc5AI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
uiSummonTimes = 0;
uiPosition = 0;
@@ -81,7 +81,7 @@ public:
SetArgentChampion();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiSummonTimes;
uint8 uiPosition;
@@ -125,8 +125,8 @@ public:
break;
case DATA_IN_POSITION: //movement done.
me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f);
- if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE)))
- pInstance->HandleGameObject(pGO->GetGUID(), false);
+ if (GameObject* pGO = GameObject::GetGameObject(*me, instance->GetData64(DATA_MAIN_GATE)))
+ instance->HandleGameObject(pGO->GetGUID(), false);
NextStep(10000, false, 3);
break;
case DATA_LESSER_CHAMPIONS_DEFEATED:
@@ -225,10 +225,10 @@ public:
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
if (Unit* unit = pVehicle->GetPassenger(0))
uiGrandChampionBoss1 = unit->GetGUID();
- if (pInstance)
+ if (instance)
{
- pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID);
- pInstance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1);
+ instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID);
+ instance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1);
}
pBoss->AI()->SetData(1, 0);
break;
@@ -241,10 +241,10 @@ public:
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
if (Unit* unit = pVehicle->GetPassenger(0))
uiGrandChampionBoss2 = unit->GetGUID();
- if (pInstance)
+ if (instance)
{
- pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID);
- pInstance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2);
+ instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID);
+ instance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2);
}
pBoss->AI()->SetData(2, 0);
break;
@@ -257,10 +257,10 @@ public:
if (Vehicle* pVehicle = pBoss->GetVehicleKit())
if (Unit* unit = pVehicle->GetPassenger(0))
uiGrandChampionBoss3 = unit->GetGUID();
- if (pInstance)
+ if (instance)
{
- pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID);
- pInstance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3);
+ instance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID);
+ instance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3);
}
pBoss->AI()->SetData(3, 0);
break;
@@ -350,30 +350,30 @@ public:
void StartEncounter()
{
- if (!pInstance)
+ if (!instance)
return;
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
- if (pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED)
+ if (instance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED)
{
- if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED)
+ if (instance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && instance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED)
{
- if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED)
+ if (instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED)
me->AI()->SetData(DATA_START, 0);
- if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE)
+ if (instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE)
DoStartArgentChampionEncounter();
}
- if ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
- pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) ||
- pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE)
+ if ((instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
+ instance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) ||
+ instance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE)
me->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0);
}
}
- void AggroAllPlayers(Creature* pTemp)
+ void AggroAllPlayers(Creature* temp)
{
Map::PlayerList const &PlList = me->GetMap()->GetPlayers();
@@ -389,12 +389,12 @@ public:
if (player->isAlive())
{
- pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
- pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
- pTemp->SetReactState(REACT_AGGRESSIVE);
- pTemp->SetInCombatWith(player);
- player->SetInCombatWith(pTemp);
- pTemp->AddThreat(player, 0.0f);
+ temp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
+ temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+ temp->SetReactState(REACT_AGGRESSIVE);
+ temp->SetInCombatWith(player);
+ player->SetInCombatWith(temp);
+ temp->AddThreat(player, 0.0f);
}
}
}
@@ -434,7 +434,7 @@ public:
void JustSummoned(Creature* summon)
{
- if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED)
+ if (instance && instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED)
{
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
summon->SetReactState(REACT_PASSIVE);
@@ -468,22 +468,22 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- InstanceScript* pInstance = creature->GetInstanceScript();
+ InstanceScript* instance = creature->GetInstanceScript();
- if (pInstance &&
- ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
- pInstance->GetData(BOSS_BLACK_KNIGHT) == DONE &&
- pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) ||
- pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE))
+ if (instance &&
+ ((instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
+ instance->GetData(BOSS_BLACK_KNIGHT) == DONE &&
+ instance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) ||
+ instance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE))
return false;
- if (pInstance &&
- pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED &&
- pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED &&
- pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED &&
- pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED)
+ if (instance &&
+ instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED &&
+ instance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED &&
+ instance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED &&
+ instance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
- else if (pInstance)
+ else if (instance)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index bc35dad822e..1ca1c69831c 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -136,10 +136,10 @@ public:
{
boss_anubarak_trialAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
std::list<uint64> m_vBurrowGUID;
@@ -190,8 +190,8 @@ public:
if (who->GetTypeId() == TYPEID_PLAYER)
{
DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me);
- if (m_pInstance)
- m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
+ if (m_instance)
+ m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
}
}
@@ -206,20 +206,20 @@ public:
void JustReachedHome()
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_ANUBARAK, FAIL);
+ if (m_instance)
+ m_instance->SetData(TYPE_ANUBARAK, FAIL);
//Summon Scarab Swarms neutral at random places
for (int i=0; i < 10; i++)
- if (Creature* pTemp = me->SummonCreature(NPC_SCARAB, AnubarakLoc[1].GetPositionX()+urand(0, 50)-25, AnubarakLoc[1].GetPositionY()+urand(0, 50)-25, AnubarakLoc[1].GetPositionZ()))
- pTemp->setFaction(31);
+ if (Creature* temp = me->SummonCreature(NPC_SCARAB, AnubarakLoc[1].GetPositionX()+urand(0, 50)-25, AnubarakLoc[1].GetPositionY()+urand(0, 50)-25, AnubarakLoc[1].GetPositionZ()))
+ temp->setFaction(31);
}
void JustDied(Unit* /*killer*/)
{
Summons.DespawnAll();
DoScriptText(SAY_DEATH, me);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_ANUBARAK, DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_ANUBARAK, DONE);
}
void JustSummoned(Creature* summoned)
@@ -255,8 +255,8 @@ public:
DoScriptText(SAY_AGGRO, me);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetInCombatWithZone();
- if (m_pInstance)
- m_pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS);
+ if (m_instance)
+ m_instance->SetData(TYPE_ANUBARAK, IN_PROGRESS);
//Despawn Scarab Swarms neutral
Summons.DoAction(NPC_SCARAB, ACTION_SCARAB_SUBMERGE);
//Spawn Burrow
@@ -421,10 +421,10 @@ public:
{
mob_swarm_scarabAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiDeterminationTimer;
@@ -488,10 +488,10 @@ public:
{
mob_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiSpiderFrenzyTimer;
uint32 m_uiSubmergeTimer;
@@ -645,10 +645,10 @@ public:
{
mob_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiIncreaseSpeedTimer;
uint8 m_uiSpeed;
uint64 m_uiTargetGUID;
@@ -680,7 +680,7 @@ public:
Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID);
if (!target || !target->isAlive() || !target->HasAura(SPELL_MARK))
{
- if (Creature* pAnubarak = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_ANUBARAK)))
+ if (Creature* pAnubarak = Unit::GetCreature((*me), m_instance->GetData64(NPC_ANUBARAK)))
pAnubarak->CastSpell(pAnubarak, SPELL_SPIKE_TELE, false);
me->DisappearAndDie();
return;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index ff342db5503..7be6775f705 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -64,10 +64,10 @@ public:
{
boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*) creature->GetInstanceScript();
+ m_instance = (InstanceScript*) creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
uint32 m_uiChampionsNotStarted;
uint32 m_uiChampionsFailed;
@@ -101,7 +101,7 @@ public:
vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_WARRIOR : NPC_ALLIANCE_WARRIOR);
uint8 healersSubtracted = 2;
- if (m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC)
+ if (m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC)
healersSubtracted = 1;
for (uint8 i = 0; i < healersSubtracted; ++i)
{
@@ -136,7 +136,7 @@ public:
vHealersEntries.erase(vHealersEntries.begin()+pos);
}
- if (m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL || m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC)
+ if (m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL || m_instance->instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC)
for (uint8 i = 0; i < 4; ++i)
vOtherEntries.erase(vOtherEntries.begin()+urand(0, vOtherEntries.size()-1));
@@ -168,22 +168,22 @@ public:
for (uint8 i = 0; i < vChampionEntries.size(); ++i)
{
uint8 pos = urand(0, vChampionJumpTarget.size()-1);
- if (Creature* pTemp = me->SummonCreature(vChampionEntries[i], vChampionJumpOrigin[urand(0, vChampionJumpOrigin.size()-1)], TEMPSUMMON_MANUAL_DESPAWN))
+ if (Creature* temp = me->SummonCreature(vChampionEntries[i], vChampionJumpOrigin[urand(0, vChampionJumpOrigin.size()-1)], TEMPSUMMON_MANUAL_DESPAWN))
{
- Summons.Summon(pTemp);
- pTemp->SetReactState(REACT_PASSIVE);
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+ Summons.Summon(temp);
+ temp->SetReactState(REACT_PASSIVE);
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
if (playerTeam == ALLIANCE)
{
- pTemp->SetHomePosition(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 0);
- pTemp->GetMotionMaster()->MoveJump(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f);
- pTemp->SetOrientation(0);
+ temp->SetHomePosition(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 0);
+ temp->GetMotionMaster()->MoveJump(vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f);
+ temp->SetOrientation(0);
}
else
{
- pTemp->SetHomePosition((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 3);
- pTemp->GetMotionMaster()->MoveJump((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f);
- pTemp->SetOrientation(3);
+ temp->SetHomePosition((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 3);
+ temp->GetMotionMaster()->MoveJump((ToCCommonLoc[1].GetPositionX()*2)-vChampionJumpTarget[pos].GetPositionX(), vChampionJumpTarget[pos].GetPositionY(), vChampionJumpTarget[pos].GetPositionZ(), 20.0f, 20.0f);
+ temp->SetOrientation(3);
}
}
vChampionJumpTarget.erase(vChampionJumpTarget.begin()+pos);
@@ -200,10 +200,10 @@ public:
case 1:
for (std::list<uint64>::iterator i = Summons.begin(); i != Summons.end(); ++i)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *i))
+ if (Creature* temp = Unit::GetCreature(*me, *i))
{
- pTemp->SetReactState(REACT_AGGRESSIVE);
- pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+ temp->SetReactState(REACT_AGGRESSIVE);
+ temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
}
break;
@@ -214,7 +214,7 @@ public:
m_uiChampionsFailed++;
if (m_uiChampionsFailed + m_uiChampionsKilled >= Summons.size())
{
- m_pInstance->SetData(TYPE_CRUSADERS, FAIL);
+ m_instance->SetData(TYPE_CRUSADERS, FAIL);
Summons.DespawnAll();
me->DespawnOrUnsummon();
}
@@ -227,16 +227,16 @@ public:
m_uiChampionsKilled = 0;
m_bInProgress = true;
Summons.DoZoneInCombat();
- m_pInstance->SetData(TYPE_CRUSADERS, IN_PROGRESS);
+ m_instance->SetData(TYPE_CRUSADERS, IN_PROGRESS);
}
break;
case DONE:
m_uiChampionsKilled++;
if (m_uiChampionsKilled == 1)
- m_pInstance->SetData(TYPE_CRUSADERS, SPECIAL);
+ m_instance->SetData(TYPE_CRUSADERS, SPECIAL);
else if (m_uiChampionsKilled >= Summons.size())
{
- m_pInstance->SetData(TYPE_CRUSADERS, DONE);
+ m_instance->SetData(TYPE_CRUSADERS, DONE);
Summons.DespawnAll();
me->DespawnOrUnsummon();
}
@@ -253,11 +253,11 @@ struct boss_faction_championsAI : public ScriptedAI
{
boss_faction_championsAI(Creature* creature, uint32 aitype) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*) creature->GetInstanceScript();
+ m_instance = (InstanceScript*) creature->GetInstanceScript();
mAIType = aitype;
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint64 championControllerGUID;
uint32 mAIType;
@@ -273,8 +273,8 @@ struct boss_faction_championsAI : public ScriptedAI
void JustReachedHome()
{
- if (m_pInstance)
- if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+ if (m_instance)
+ if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
pChampionController->AI()->SetData(2, FAIL);
me->DespawnOrUnsummon();
}
@@ -326,8 +326,8 @@ struct boss_faction_championsAI : public ScriptedAI
void JustDied(Unit* /*killer*/)
{
if (mAIType != AI_PET)
- if (m_pInstance)
- if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+ if (m_instance)
+ if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
pChampionController->AI()->SetData(2, DONE);
}
@@ -335,8 +335,8 @@ struct boss_faction_championsAI : public ScriptedAI
{
DoCast(me, SPELL_ANTI_AOE, true);
me->SetInCombatWithZone();
- if (m_pInstance)
- if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+ if (m_instance)
+ if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
pChampionController->AI()->SetData(2, IN_PROGRESS);
}
@@ -351,18 +351,18 @@ struct boss_faction_championsAI : public ScriptedAI
if (Player* player = players.begin()->getSource())
TeamInInstance = player->GetTeam();
- if (m_pInstance)
+ if (m_instance)
{
if (TeamInInstance == ALLIANCE)
{
- if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_VARIAN)))
- DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0, 3), pTemp); // + cause we are on negative
+ if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_VARIAN)))
+ DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0, 3), temp); // + cause we are on negative
}
else
- if (Creature* pTemp = me->FindNearestCreature(NPC_GARROSH, 300.f))
- DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0, 3), pTemp); // + cause we are on negative
+ if (Creature* temp = me->FindNearestCreature(NPC_GARROSH, 300.f))
+ DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0, 3), temp); // + cause we are on negative
- m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
+ m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
}
}
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 962ecdff83f..ec573f75bc6 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -107,11 +107,11 @@ public:
{
boss_jaraxxusAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = creature->GetInstanceScript();
+ m_instance = creature->GetInstanceScript();
Reset();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
@@ -126,8 +126,8 @@ public:
void Reset()
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED);
+ if (m_instance)
+ m_instance->SetData(TYPE_JARAXXUS, NOT_STARTED);
SetEquipmentSlots(false, EQUIP_MAIN, EQUIP_OFFHAND, EQUIP_RANGED);
m_uiFelFireballTimer = 5*IN_MILLISECONDS;
m_uiFelLightningTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS);
@@ -142,8 +142,8 @@ public:
void JustReachedHome()
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_JARAXXUS, FAIL);
+ if (m_instance)
+ m_instance->SetData(TYPE_JARAXXUS, FAIL);
DoCast(me, SPELL_JARAXXUS_CHAINS);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->SetReactState(REACT_PASSIVE);
@@ -153,8 +153,8 @@ public:
{
if (who->GetTypeId() == TYPEID_PLAYER)
{
- if (m_pInstance)
- m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
+ if (m_instance)
+ m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
}
}
@@ -162,8 +162,8 @@ public:
{
Summons.DespawnAll();
DoScriptText(SAY_DEATH, me);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_JARAXXUS, DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_JARAXXUS, DONE);
}
void JustSummoned(Creature* summoned)
@@ -174,8 +174,8 @@ public:
void EnterCombat(Unit* /*who*/)
{
me->SetInCombatWithZone();
- if (m_pInstance)
- m_pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS);
+ if (m_instance)
+ m_instance->SetData(TYPE_JARAXXUS, IN_PROGRESS);
DoScriptText(SAY_AGGRO, me);
}
@@ -299,11 +299,11 @@ public:
{
mob_infernal_volcanoAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
Reset();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
@@ -354,11 +354,11 @@ public:
{
mob_fel_infernalAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
Reset();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiFelStreakTimer;
void Reset()
@@ -378,7 +378,7 @@ public:
if (!UpdateVictim())
return;
- if (m_pInstance && m_pInstance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
+ if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
me->DespawnOrUnsummon();
if (m_uiFelStreakTimer <= uiDiff)
@@ -408,11 +408,11 @@ public:
{
mob_nether_portalAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
Reset();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
@@ -463,13 +463,13 @@ public:
{
mob_mistress_of_painAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
- if (m_pInstance)
- m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE);
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
+ if (m_instance)
+ m_instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE);
Reset();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiShivanSlashTimer;
uint32 m_uiSpinningStrikeTimer;
uint32 m_uiMistressKissTimer;
@@ -484,8 +484,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (m_pInstance)
- m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE);
+ if (m_instance)
+ m_instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE);
}
void UpdateAI(const uint32 uiDiff)
@@ -493,7 +493,7 @@ public:
if (!UpdateVictim())
return;
- if (m_pInstance && m_pInstance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
+ if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
me->DespawnOrUnsummon();
if (m_uiShivanSlashTimer <= uiDiff)
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 4824c46deb7..d4514dd547e 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -123,10 +123,10 @@ public:
{
boss_gormokAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiImpaleTimer;
uint32 m_uiStaggeringStompTimer;
@@ -151,7 +151,7 @@ public:
void EnterEvadeMode()
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
ScriptedAI::EnterEvadeMode();
}
@@ -162,7 +162,7 @@ public:
switch (uiId)
{
case 0:
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetReactState(REACT_AGGRESSIVE);
me->SetInCombatWithZone();
@@ -172,16 +172,16 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE);
}
void JustReachedHome()
{
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
- m_pInstance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
}
me->DespawnOrUnsummon();
}
@@ -189,7 +189,7 @@ public:
void EnterCombat(Unit* /*who*/)
{
me->SetInCombatWithZone();
- m_pInstance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS);
+ m_instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS);
}
void JustSummoned(Creature* summon)
@@ -262,12 +262,12 @@ public:
{
mob_snobold_vassalAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
- if (m_pInstance)
- m_pInstance->SetData(DATA_SNOBOLD_COUNT, INCREASE);
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
+ if (m_instance)
+ m_instance->SetData(DATA_SNOBOLD_COUNT, INCREASE);
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiFireBombTimer;
uint32 m_uiBatterTimer;
uint32 m_uiHeadCrackTimer;
@@ -283,15 +283,15 @@ public:
m_uiTargetGUID = 0;
m_bTargetDied = false;
- if (m_pInstance)
- m_uiBossGUID = m_pInstance->GetData64(NPC_GORMOK);
+ if (m_instance)
+ m_uiBossGUID = m_instance->GetData64(NPC_GORMOK);
//Workaround for Snobold
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterEvadeMode()
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
ScriptedAI::EnterEvadeMode();
}
@@ -326,8 +326,8 @@ public:
if (Unit* target = Unit::GetPlayer(*me, m_uiTargetGUID))
if (target->isAlive())
target->RemoveAurasDueToSpell(SPELL_SNOBOLLED);
- if (m_pInstance)
- m_pInstance->SetData(DATA_SNOBOLD_COUNT, DECREASE);
+ if (m_instance)
+ m_instance->SetData(DATA_SNOBOLD_COUNT, DECREASE);
}
void UpdateAI(const uint32 uiDiff)
@@ -339,9 +339,9 @@ public:
{
if (!target->isAlive())
{
- if (m_pInstance)
+ if (m_instance)
{
- Unit* gormok = ObjectAccessor::GetCreature(*me, m_pInstance->GetData64(NPC_GORMOK));
+ Unit* gormok = ObjectAccessor::GetCreature(*me, m_instance->GetData64(NPC_GORMOK));
if (gormok && gormok->isAlive())
{
SetCombatMovement(false);
@@ -754,10 +754,10 @@ public:
{
boss_icehowlAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiFerociousButtTimer;
uint32 m_uiArticBreathTimer;
@@ -791,8 +791,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE);
}
void MovementInform(uint32 uiType, uint32 uiId)
@@ -820,7 +820,7 @@ public:
m_bMovementFinish = true;
break;
case 2:
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetReactState(REACT_AGGRESSIVE);
me->SetInCombatWithZone();
@@ -830,16 +830,16 @@ public:
void EnterEvadeMode()
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
ScriptedAI::EnterEvadeMode();
}
void JustReachedHome()
{
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
- m_pInstance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
}
me->DespawnOrUnsummon();
}
@@ -848,15 +848,15 @@ public:
{
if (who->GetTypeId() == TYPEID_PLAYER)
{
- if (m_pInstance)
- m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
+ if (m_instance)
+ m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
}
}
void EnterCombat(Unit* /*who*/)
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS);
+ if (m_instance)
+ m_instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS);
me->SetInCombatWithZone();
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index dff484a4933..495faf6f855 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -143,10 +143,10 @@ struct boss_twin_baseAI : public ScriptedAI
{
boss_twin_baseAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
AuraStateType m_uiAuraState;
@@ -190,8 +190,8 @@ struct boss_twin_baseAI : public ScriptedAI
void JustReachedHome()
{
- if (m_pInstance)
- m_pInstance->SetData(TYPE_VALKIRIES, FAIL);
+ if (m_instance)
+ m_instance->SetData(TYPE_VALKIRIES, FAIL);
Summons.DespawnAll();
me->DespawnOrUnsummon();
@@ -204,7 +204,7 @@ struct boss_twin_baseAI : public ScriptedAI
switch (uiId)
{
case 1:
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetReactState(REACT_AGGRESSIVE);
break;
@@ -216,8 +216,8 @@ struct boss_twin_baseAI : public ScriptedAI
if (who->GetTypeId() == TYPEID_PLAYER)
{
DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me);
- if (m_pInstance)
- m_pInstance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
+ if (m_instance)
+ m_instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
}
}
@@ -231,12 +231,12 @@ struct boss_twin_baseAI : public ScriptedAI
switch (summoned->GetEntry())
{
case NPC_LIGHT_ESSENCE:
- m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_LIGHT_ESSENCE_HELPER);
- m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER);
+ m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_LIGHT_ESSENCE_HELPER);
+ m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER);
break;
case NPC_DARK_ESSENCE:
- m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DARK_ESSENCE_HELPER);
- m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER);
+ m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DARK_ESSENCE_HELPER);
+ m_instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER);
break;
case NPC_BULLET_CONTROLLER:
me->m_Events.AddEvent(new OrbsDespawner(me), me->m_Events.CalculateTime(100));
@@ -248,7 +248,7 @@ struct boss_twin_baseAI : public ScriptedAI
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
- if (m_pInstance)
+ if (m_instance)
{
if (Creature* pSister = GetSister())
{
@@ -257,13 +257,13 @@ struct boss_twin_baseAI : public ScriptedAI
me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
pSister->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
- m_pInstance->SetData(TYPE_VALKIRIES, DONE);
+ m_instance->SetData(TYPE_VALKIRIES, DONE);
Summons.DespawnAll();
}
else
{
me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
- m_pInstance->SetData(TYPE_VALKIRIES, SPECIAL);
+ m_instance->SetData(TYPE_VALKIRIES, SPECIAL);
}
}
}
@@ -273,20 +273,20 @@ struct boss_twin_baseAI : public ScriptedAI
// Called when sister pointer needed
Creature* GetSister()
{
- return Unit::GetCreature((*me), m_pInstance->GetData64(m_uiSisterNpcId));
+ return Unit::GetCreature((*me), m_instance->GetData64(m_uiSisterNpcId));
}
void EnterCombat(Unit* /*who*/)
{
me->SetInCombatWithZone();
- if (m_pInstance)
+ if (m_instance)
{
if (Creature* pSister = GetSister())
{
me->AddAura(m_uiMyEmphatySpellId, pSister);
pSister->SetInCombatWithZone();
}
- m_pInstance->SetData(TYPE_VALKIRIES, IN_PROGRESS);
+ m_instance->SetData(TYPE_VALKIRIES, IN_PROGRESS);
}
DoScriptText(SAY_AGGRO, me);
@@ -315,7 +315,7 @@ struct boss_twin_baseAI : public ScriptedAI
void UpdateAI(const uint32 uiDiff)
{
- if (!m_pInstance || !UpdateVictim())
+ if (!m_instance || !UpdateVictim())
return;
switch (m_uiStage)
@@ -406,10 +406,10 @@ public:
{
boss_fjolaAI(Creature* creature) : boss_twin_baseAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
void Reset() {
boss_twin_baseAI::Reset();
@@ -429,17 +429,17 @@ public:
m_uiTouchSpellId = SPELL_LIGHT_TOUCH;
m_uiSpikeSpellId = SPELL_LIGHT_TWIN_SPIKE;
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
+ m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
}
}
void EnterCombat(Unit* who)
{
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
+ m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT);
}
me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN);
@@ -448,14 +448,14 @@ public:
void EnterEvadeMode()
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
boss_twin_baseAI::EnterEvadeMode();
}
void JustReachedHome()
{
- if (m_pInstance)
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ if (m_instance)
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
boss_twin_baseAI::JustReachedHome();
}
@@ -552,10 +552,10 @@ struct mob_unleashed_ballAI : public ScriptedAI
{
mob_unleashed_ballAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiRangeCheckTimer;
void MoveToNextPoint()
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 7566d9bc410..99a6abb91a9 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -33,7 +33,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript
{
- instance_trial_of_the_crusader_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 EncounterStatus[MAX_ENCOUNTERS];
uint32 TrialCounter;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 913484cbf77..76295f403fa 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -106,10 +106,10 @@ class npc_announcer_toc10 : public CreatureScript
{
npc_announcer_toc10AI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
void Reset()
{
@@ -239,10 +239,10 @@ class boss_lich_king_toc : public CreatureScript
{
boss_lich_king_tocAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)creature->GetInstanceScript();
+ m_instance = (InstanceScript*)creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiUpdateTimer;
void Reset()
@@ -254,7 +254,7 @@ class boss_lich_king_toc : public CreatureScript
summoned->CastSpell(summoned, 51807, false);
summoned->SetDisplayId(11686);
}
- if (m_pInstance) m_pInstance->SetData(TYPE_LICH_KING, IN_PROGRESS);
+ if (m_instance) m_instance->SetData(TYPE_LICH_KING, IN_PROGRESS);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
}
@@ -265,77 +265,77 @@ class boss_lich_king_toc : public CreatureScript
switch (uiId)
{
case 0:
- m_pInstance->SetData(TYPE_EVENT, 5030);
+ m_instance->SetData(TYPE_EVENT, 5030);
break;
case 1:
- m_pInstance->SetData(TYPE_EVENT, 5050);
+ m_instance->SetData(TYPE_EVENT, 5050);
break;
}
}
void UpdateAI(const uint32 uiDiff)
{
- if (!m_pInstance) return;
- if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_LICH_KING_1) return;
+ if (!m_instance) return;
+ if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_LICH_KING_1) return;
- m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER);
+ m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER);
if (m_uiUpdateTimer <= uiDiff)
{
- switch (m_pInstance->GetData(TYPE_EVENT))
+ switch (m_instance->GetData(TYPE_EVENT))
{
case 5010:
DoScriptText(SAY_STAGE_4_02, me);
m_uiUpdateTimer = 3000;
me->GetMotionMaster()->MovePoint(0, LichKingLoc[0]);
- m_pInstance->SetData(TYPE_EVENT, 5020);
+ m_instance->SetData(TYPE_EVENT, 5020);
break;
case 5030:
DoScriptText(SAY_STAGE_4_04, me);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK);
m_uiUpdateTimer = 10000;
- m_pInstance->SetData(TYPE_EVENT, 5040);
+ m_instance->SetData(TYPE_EVENT, 5040);
break;
case 5040:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
me->GetMotionMaster()->MovePoint(1, LichKingLoc[1]);
m_uiUpdateTimer = 1000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 5050:
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 5060);
+ m_instance->SetData(TYPE_EVENT, 5060);
break;
case 5060:
DoScriptText(SAY_STAGE_4_05, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL);
m_uiUpdateTimer = 2500;
- m_pInstance->SetData(TYPE_EVENT, 5070);
+ m_instance->SetData(TYPE_EVENT, 5070);
break;
case 5070:
me->CastSpell(me, 68198, false);
m_uiUpdateTimer = 1500;
- m_pInstance->SetData(TYPE_EVENT, 5080);
+ m_instance->SetData(TYPE_EVENT, 5080);
break;
case 5080:
- if (GameObject* pGoFloor = m_pInstance->instance->GetGameObject(m_pInstance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
+ if (GameObject* pGoFloor = m_instance->instance->GetGameObject(m_instance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
pGoFloor->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED);
me->CastSpell(me, 69016, false);
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->SetData(TYPE_LICH_KING, DONE);
- Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_ANUBARAK));
- if (!pTemp || !pTemp->isAlive())
- pTemp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
+ m_instance->SetData(TYPE_LICH_KING, DONE);
+ Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_ANUBARAK));
+ if (!temp || !temp->isAlive())
+ temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
}
me->DespawnOrUnsummon();
m_uiUpdateTimer = 20000;
break;
}
} else m_uiUpdateTimer -= uiDiff;
- m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
+ m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
}
};
@@ -355,10 +355,10 @@ class npc_fizzlebang_toc : public CreatureScript
{
npc_fizzlebang_tocAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_pInstance = (InstanceScript*)me->GetInstanceScript();
+ m_instance = (InstanceScript*)me->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
uint32 m_uiUpdateTimer;
uint64 m_uiPortalGUID;
@@ -367,12 +367,12 @@ class npc_fizzlebang_toc : public CreatureScript
void JustDied(Unit* killer)
{
DoScriptText(SAY_STAGE_1_06, me, killer);
- m_pInstance->SetData(TYPE_EVENT, 1180);
- if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS)))
+ m_instance->SetData(TYPE_EVENT, 1180);
+ if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS)))
{
- pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
- pTemp->SetReactState(REACT_AGGRESSIVE);
- pTemp->SetInCombatWithZone();
+ temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+ temp->SetReactState(REACT_AGGRESSIVE);
+ temp->SetInCombatWithZone();
}
}
@@ -391,11 +391,11 @@ class npc_fizzlebang_toc : public CreatureScript
{
case 1:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
- m_pInstance->SetData(TYPE_EVENT, 1120);
- m_pInstance->SetData(TYPE_EVENT_TIMER, 1000);
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->SetData(TYPE_EVENT, 1120);
+ m_instance->SetData(TYPE_EVENT_TIMER, 1000);
}
break;
}
@@ -408,22 +408,22 @@ class npc_fizzlebang_toc : public CreatureScript
void UpdateAI(const uint32 uiDiff)
{
- if (!m_pInstance) return;
+ if (!m_instance) return;
- if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_FIZZLEBANG) return;
+ if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_FIZZLEBANG) return;
- m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER);
+ m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER);
if (m_uiUpdateTimer <= uiDiff)
{
- switch (m_pInstance->GetData(TYPE_EVENT))
+ switch (m_instance->GetData(TYPE_EVENT))
{
case 1110:
- m_pInstance->SetData(TYPE_EVENT, 1120);
+ m_instance->SetData(TYPE_EVENT, 1120);
m_uiUpdateTimer = 4000;
break;
case 1120:
DoScriptText(SAY_STAGE_1_02, me);
- m_pInstance->SetData(TYPE_EVENT, 1130);
+ m_instance->SetData(TYPE_EVENT, 1130);
m_uiUpdateTimer = 12000;
break;
case 1130:
@@ -437,12 +437,12 @@ class npc_fizzlebang_toc : public CreatureScript
pTrigger->SetDisplayId(22862);
pTrigger->CastSpell(pTrigger, SPELL_WILFRED_PORTAL, false);
}
- m_pInstance->SetData(TYPE_EVENT, 1132);
+ m_instance->SetData(TYPE_EVENT, 1132);
m_uiUpdateTimer = 4000;
break;
case 1132:
me->GetMotionMaster()->MovementExpired();
- m_pInstance->SetData(TYPE_EVENT, 1134);
+ m_instance->SetData(TYPE_EVENT, 1134);
m_uiUpdateTimer = 4000;
break;
case 1134:
@@ -455,54 +455,54 @@ class npc_fizzlebang_toc : public CreatureScript
m_uiPortalGUID = pPortal->GetGUID();
}
m_uiUpdateTimer = 4000;
- m_pInstance->SetData(TYPE_EVENT, 1135);
+ m_instance->SetData(TYPE_EVENT, 1135);
break;
case 1135:
- m_pInstance->SetData(TYPE_EVENT, 1140);
+ m_instance->SetData(TYPE_EVENT, 1140);
m_uiUpdateTimer = 3000;
break;
case 1140:
DoScriptText(SAY_STAGE_1_04, me);
- if (Creature* pTemp = me->SummonCreature(NPC_JARAXXUS, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 5.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
+ if (Creature* temp = me->SummonCreature(NPC_JARAXXUS, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 5.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
{
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
- pTemp->SetReactState(REACT_PASSIVE);
- pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY()-10, ToCCommonLoc[1].GetPositionZ());
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+ temp->SetReactState(REACT_PASSIVE);
+ temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY()-10, ToCCommonLoc[1].GetPositionZ());
}
- m_pInstance->SetData(TYPE_EVENT, 1142);
+ m_instance->SetData(TYPE_EVENT, 1142);
m_uiUpdateTimer = 5000;
break;
case 1142:
- if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS)))
- pTemp->SetTarget(me->GetGUID());
+ if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS)))
+ temp->SetTarget(me->GetGUID());
if (Creature* pTrigger = Unit::GetCreature(*me, m_uiTriggerGUID))
pTrigger->DespawnOrUnsummon();
if (Creature* pPortal = Unit::GetCreature(*me, m_uiPortalGUID))
pPortal->DespawnOrUnsummon();
- m_pInstance->SetData(TYPE_EVENT, 1144);
+ m_instance->SetData(TYPE_EVENT, 1144);
m_uiUpdateTimer = 10000;
break;
case 1144:
- if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS)))
- DoScriptText(SAY_STAGE_1_05, pTemp);
- m_pInstance->SetData(TYPE_EVENT, 1150);
+ if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS)))
+ DoScriptText(SAY_STAGE_1_05, temp);
+ m_instance->SetData(TYPE_EVENT, 1150);
m_uiUpdateTimer = 5000;
break;
case 1150:
- if (Creature* pTemp = Unit::GetCreature(*me, m_pInstance->GetData64(NPC_JARAXXUS)))
+ if (Creature* temp = Unit::GetCreature(*me, m_instance->GetData64(NPC_JARAXXUS)))
{
//1-shot Fizzlebang
- pTemp->CastSpell(me, 67888, false);
- me->SetInCombatWith(pTemp);
- pTemp->AddThreat(me, 1000.0f);
- pTemp->AI()->AttackStart(me);
+ temp->CastSpell(me, 67888, false);
+ me->SetInCombatWith(temp);
+ temp->AddThreat(me, 1000.0f);
+ temp->AI()->AttackStart(me);
}
- m_pInstance->SetData(TYPE_EVENT, 1160);
+ m_instance->SetData(TYPE_EVENT, 1160);
m_uiUpdateTimer = 3000;
break;
}
} else m_uiUpdateTimer -= uiDiff;
- m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
+ m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
}
};
@@ -522,10 +522,10 @@ class npc_tirion_toc : public CreatureScript
{
npc_tirion_tocAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)me->GetInstanceScript();
+ m_instance = (InstanceScript*)me->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiUpdateTimer;
void Reset() {}
@@ -534,271 +534,271 @@ class npc_tirion_toc : public CreatureScript
void UpdateAI(const uint32 uiDiff)
{
- if (!m_pInstance) return;
- if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_TIRION) return;
+ if (!m_instance) return;
+ if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_TIRION) return;
- m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER);
+ m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER);
if (m_uiUpdateTimer <= uiDiff)
{
- switch (m_pInstance->GetData(TYPE_EVENT))
+ switch (m_instance->GetData(TYPE_EVENT))
{
case 110:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
DoScriptText(SAY_STAGE_0_01, me);
m_uiUpdateTimer = 22000;
- m_pInstance->SetData(TYPE_EVENT, 120);
+ m_instance->SetData(TYPE_EVENT, 120);
break;
case 140:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
DoScriptText(SAY_STAGE_0_02, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 150);
+ m_instance->SetData(TYPE_EVENT, 150);
break;
case 150:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
- if (m_pInstance->GetData(TYPE_BEASTS) != DONE)
+ if (m_instance->GetData(TYPE_BEASTS) != DONE)
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
- if (Creature* pTemp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS))
+ if (Creature* temp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS))
{
- pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ());
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
- pTemp->SetReactState(REACT_PASSIVE);
+ temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ());
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+ temp->SetReactState(REACT_PASSIVE);
}
}
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 155);
+ m_instance->SetData(TYPE_EVENT, 155);
break;
case 155:
- m_pInstance->SetData(TYPE_BEASTS, IN_PROGRESS);
+ m_instance->SetData(TYPE_BEASTS, IN_PROGRESS);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 160);
+ m_instance->SetData(TYPE_EVENT, 160);
break;
case 200:
DoScriptText(SAY_STAGE_0_04, me);
m_uiUpdateTimer = 8000;
- m_pInstance->SetData(TYPE_EVENT, 205);
+ m_instance->SetData(TYPE_EVENT, 205);
break;
case 205:
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 210);
+ m_instance->SetData(TYPE_EVENT, 210);
break;
case 210:
- if (m_pInstance->GetData(TYPE_BEASTS) != DONE)
+ if (m_instance->GetData(TYPE_BEASTS) != DONE)
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
- if (Creature* pTemp = me->SummonCreature(NPC_DREADSCALE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN))
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
+ if (Creature* temp = me->SummonCreature(NPC_DREADSCALE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN))
{
- pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ());
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
- pTemp->SetReactState(REACT_PASSIVE);
+ temp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ());
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+ temp->SetReactState(REACT_PASSIVE);
}
- if (Creature* pTemp = me->SummonCreature(NPC_ACIDMAW, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN))
+ if (Creature* temp = me->SummonCreature(NPC_ACIDMAW, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ(), 5, TEMPSUMMON_MANUAL_DESPAWN))
{
- pTemp->SetVisible(true);
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
- pTemp->SetReactState(REACT_PASSIVE);
+ temp->SetVisible(true);
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+ temp->SetReactState(REACT_PASSIVE);
}
}
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 220);
+ m_instance->SetData(TYPE_EVENT, 220);
break;
case 220:
- m_pInstance->SetData(TYPE_EVENT, 230);
+ m_instance->SetData(TYPE_EVENT, 230);
break;
case 300:
DoScriptText(SAY_STAGE_0_05, me);
m_uiUpdateTimer = 8000;
- m_pInstance->SetData(TYPE_EVENT, 305);
+ m_instance->SetData(TYPE_EVENT, 305);
break;
case 305:
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 310);
+ m_instance->SetData(TYPE_EVENT, 310);
break;
case 310:
- if (m_pInstance->GetData(TYPE_BEASTS) != DONE)
+ if (m_instance->GetData(TYPE_BEASTS) != DONE)
{
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
- if (Creature* pTemp = me->SummonCreature(NPC_ICEHOWL, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_DEAD_DESPAWN))
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
+ if (Creature* temp = me->SummonCreature(NPC_ICEHOWL, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_DEAD_DESPAWN))
{
- pTemp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ());
+ temp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ());
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->SetReactState(REACT_PASSIVE);
}
}
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 315);
+ m_instance->SetData(TYPE_EVENT, 315);
break;
case 315:
- m_pInstance->SetData(TYPE_EVENT, 320);
+ m_instance->SetData(TYPE_EVENT, 320);
break;
case 400:
DoScriptText(SAY_STAGE_0_06, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 666:
DoScriptText(SAY_STAGE_0_WIPE, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 1010:
DoScriptText(SAY_STAGE_1_01, me);
m_uiUpdateTimer = 7000;
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
me->SummonCreature(NPC_FIZZLEBANG, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 1180:
DoScriptText(SAY_STAGE_1_07, me);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 2000:
DoScriptText(SAY_STAGE_1_08, me);
m_uiUpdateTimer = 18000;
- m_pInstance->SetData(TYPE_EVENT, 2010);
+ m_instance->SetData(TYPE_EVENT, 2010);
break;
case 2030:
DoScriptText(SAY_STAGE_1_11, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 3000:
DoScriptText(SAY_STAGE_2_01, me);
m_uiUpdateTimer = 12000;
- m_pInstance->SetData(TYPE_EVENT, 3050);
+ m_instance->SetData(TYPE_EVENT, 3050);
break;
case 3001:
DoScriptText(SAY_STAGE_2_01, me);
m_uiUpdateTimer = 12000;
- m_pInstance->SetData(TYPE_EVENT, 3051);
+ m_instance->SetData(TYPE_EVENT, 3051);
break;
case 3060:
DoScriptText(SAY_STAGE_2_03, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 3070);
+ m_instance->SetData(TYPE_EVENT, 3070);
break;
case 3061:
DoScriptText(SAY_STAGE_2_03, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 3071);
+ m_instance->SetData(TYPE_EVENT, 3071);
break;
//Summoning crusaders
case 3091:
if (Creature* pChampionController = me->SummonCreature(NPC_CHAMPIONS_CONTROLLER, ToCCommonLoc[1]))
pChampionController->AI()->SetData(0, HORDE);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 3092);
+ m_instance->SetData(TYPE_EVENT, 3092);
break;
//Summoning crusaders
case 3090:
if (Creature* pChampionController = me->SummonCreature(NPC_CHAMPIONS_CONTROLLER, ToCCommonLoc[1]))
pChampionController->AI()->SetData(0, ALLIANCE);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 3092);
+ m_instance->SetData(TYPE_EVENT, 3092);
break;
case 3092:
- if (Creature* pChampionController = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+ if (Creature* pChampionController = Unit::GetCreature((*me), m_instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
pChampionController->AI()->SetData(1, NOT_STARTED);
- m_pInstance->SetData(TYPE_EVENT, 3095);
+ m_instance->SetData(TYPE_EVENT, 3095);
break;
//Crusaders battle end
case 3100:
DoScriptText(SAY_STAGE_2_06, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 4000:
DoScriptText(SAY_STAGE_3_01, me);
m_uiUpdateTimer = 13000;
- m_pInstance->SetData(TYPE_EVENT, 4010);
+ m_instance->SetData(TYPE_EVENT, 4010);
break;
case 4010:
DoScriptText(SAY_STAGE_3_02, me);
- if (Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
+ if (Creature* temp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
{
- pTemp->SetVisible(false);
- pTemp->SetReactState(REACT_PASSIVE);
- pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ());
- pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ());
+ temp->SetVisible(false);
+ temp->SetReactState(REACT_PASSIVE);
+ temp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ());
+ temp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ());
}
- if (Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
+ if (Creature* temp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
{
- pTemp->SetVisible(false);
- pTemp->SetReactState(REACT_PASSIVE);
- pTemp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[2].GetPositionX(), TwinValkyrsLoc[2].GetPositionY(), TwinValkyrsLoc[2].GetPositionZ());
- pTemp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[3].GetPositionX(), TwinValkyrsLoc[3].GetPositionY(), TwinValkyrsLoc[3].GetPositionZ());
+ temp->SetVisible(false);
+ temp->SetReactState(REACT_PASSIVE);
+ temp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[2].GetPositionX(), TwinValkyrsLoc[2].GetPositionY(), TwinValkyrsLoc[2].GetPositionZ());
+ temp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[3].GetPositionX(), TwinValkyrsLoc[3].GetPositionY(), TwinValkyrsLoc[3].GetPositionZ());
}
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 4015);
+ m_instance->SetData(TYPE_EVENT, 4015);
break;
case 4015:
- m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
- if (Creature* pTemp = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_LIGHTBANE)))
+ m_instance->DoUseDoorOrButton(m_instance->GetData64(GO_MAIN_GATE_DOOR));
+ if (Creature* temp = Unit::GetCreature((*me), m_instance->GetData64(NPC_LIGHTBANE)))
{
- pTemp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ());
- pTemp->SetVisible(true);
+ temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ());
+ temp->SetVisible(true);
}
- if (Creature* pTemp = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_DARKBANE)))
+ if (Creature* temp = Unit::GetCreature((*me), m_instance->GetData64(NPC_DARKBANE)))
{
- pTemp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ());
- pTemp->SetVisible(true);
+ temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ());
+ temp->SetVisible(true);
}
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 4016);
+ m_instance->SetData(TYPE_EVENT, 4016);
break;
case 4016:
- m_pInstance->SetData(TYPE_EVENT, 4017);
+ m_instance->SetData(TYPE_EVENT, 4017);
break;
case 4040:
m_uiUpdateTimer = 60000;
- m_pInstance->SetData(TYPE_EVENT, 5000);
+ m_instance->SetData(TYPE_EVENT, 5000);
break;
case 5000:
DoScriptText(SAY_STAGE_4_01, me);
m_uiUpdateTimer = 10000;
- m_pInstance->SetData(TYPE_EVENT, 5005);
+ m_instance->SetData(TYPE_EVENT, 5005);
break;
case 5005:
m_uiUpdateTimer = 8000;
- m_pInstance->SetData(TYPE_EVENT, 5010);
+ m_instance->SetData(TYPE_EVENT, 5010);
me->SummonCreature(NPC_LICH_KING_1, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5);
break;
case 5020:
DoScriptText(SAY_STAGE_4_03, me);
m_uiUpdateTimer = 1000;
- m_pInstance->SetData(TYPE_EVENT, 0);
+ m_instance->SetData(TYPE_EVENT, 0);
break;
case 6000:
me->NearTeleportTo(AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 4.0f);
m_uiUpdateTimer = 20000;
- m_pInstance->SetData(TYPE_EVENT, 6005);
+ m_instance->SetData(TYPE_EVENT, 6005);
break;
case 6005:
DoScriptText(SAY_STAGE_4_06, me);
m_uiUpdateTimer = 20000;
- m_pInstance->SetData(TYPE_EVENT, 6010);
+ m_instance->SetData(TYPE_EVENT, 6010);
break;
case 6010:
if (IsHeroic())
{
DoScriptText(SAY_STAGE_4_07, me);
m_uiUpdateTimer = 60000;
- m_pInstance->SetData(TYPE_ANUBARAK, SPECIAL);
- m_pInstance->SetData(TYPE_EVENT, 6020);
- } else m_pInstance->SetData(TYPE_EVENT, 6030);
+ m_instance->SetData(TYPE_ANUBARAK, SPECIAL);
+ m_instance->SetData(TYPE_EVENT, 6020);
+ } else m_instance->SetData(TYPE_EVENT, 6030);
break;
case 6020:
me->DespawnOrUnsummon();
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 6030);
+ m_instance->SetData(TYPE_EVENT, 6030);
break;
}
} else m_uiUpdateTimer -= uiDiff;
- m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
+ m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
}
};
@@ -818,10 +818,10 @@ class npc_garrosh_toc : public CreatureScript
{
npc_garrosh_tocAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)me->GetInstanceScript();
+ m_instance = (InstanceScript*)me->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiUpdateTimer;
void Reset() {}
@@ -830,53 +830,53 @@ class npc_garrosh_toc : public CreatureScript
void UpdateAI(const uint32 uiDiff)
{
- if (!m_pInstance) return;
- if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_GARROSH) return;
+ if (!m_instance) return;
+ if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_GARROSH) return;
- m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER);
+ m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER);
if (m_uiUpdateTimer <= uiDiff)
{
- switch (m_pInstance->GetData(TYPE_EVENT))
+ switch (m_instance->GetData(TYPE_EVENT))
{
case 130:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
DoScriptText(SAY_STAGE_0_03h, me);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 132);
+ m_instance->SetData(TYPE_EVENT, 132);
break;
case 132:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 140);
+ m_instance->SetData(TYPE_EVENT, 140);
break;
case 2010:
DoScriptText(SAY_STAGE_1_09, me);
m_uiUpdateTimer = 9000;
- m_pInstance->SetData(TYPE_EVENT, 2020);
+ m_instance->SetData(TYPE_EVENT, 2020);
break;
case 3050:
DoScriptText(SAY_STAGE_2_02h, me);
m_uiUpdateTimer = 15000;
- m_pInstance->SetData(TYPE_EVENT, 3060);
+ m_instance->SetData(TYPE_EVENT, 3060);
break;
case 3070:
DoScriptText(SAY_STAGE_2_04h, me);
m_uiUpdateTimer = 6000;
- m_pInstance->SetData(TYPE_EVENT, 3080);
+ m_instance->SetData(TYPE_EVENT, 3080);
break;
case 3081:
DoScriptText(SAY_STAGE_2_05h, me);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 3091);
+ m_instance->SetData(TYPE_EVENT, 3091);
break;
case 4030:
DoScriptText(SAY_STAGE_3_03h, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 4040);
+ m_instance->SetData(TYPE_EVENT, 4040);
break;
}
} else m_uiUpdateTimer -= uiDiff;
- m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
+ m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
}
};
@@ -896,10 +896,10 @@ class npc_varian_toc : public CreatureScript
{
npc_varian_tocAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = (InstanceScript*)me->GetInstanceScript();
+ m_instance = (InstanceScript*)me->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiUpdateTimer;
void Reset() {}
@@ -908,53 +908,53 @@ class npc_varian_toc : public CreatureScript
void UpdateAI(const uint32 uiDiff)
{
- if (!m_pInstance) return;
- if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_VARIAN) return;
+ if (!m_instance) return;
+ if (m_instance->GetData(TYPE_EVENT_NPC) != NPC_VARIAN) return;
- m_uiUpdateTimer = m_pInstance->GetData(TYPE_EVENT_TIMER);
+ m_uiUpdateTimer = m_instance->GetData(TYPE_EVENT_TIMER);
if (m_uiUpdateTimer <= uiDiff)
{
- switch (m_pInstance->GetData(TYPE_EVENT))
+ switch (m_instance->GetData(TYPE_EVENT))
{
case 120:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
DoScriptText(SAY_STAGE_0_03a, me);
m_uiUpdateTimer = 2000;
- m_pInstance->SetData(TYPE_EVENT, 122);
+ m_instance->SetData(TYPE_EVENT, 122);
break;
case 122:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 130);
+ m_instance->SetData(TYPE_EVENT, 130);
break;
case 2020:
DoScriptText(SAY_STAGE_1_10, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 2030);
+ m_instance->SetData(TYPE_EVENT, 2030);
break;
case 3051:
DoScriptText(SAY_STAGE_2_02a, me);
m_uiUpdateTimer = 10000;
- m_pInstance->SetData(TYPE_EVENT, 3061);
+ m_instance->SetData(TYPE_EVENT, 3061);
break;
case 3071:
DoScriptText(SAY_STAGE_2_04a, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 3081);
+ m_instance->SetData(TYPE_EVENT, 3081);
break;
case 3080:
DoScriptText(SAY_STAGE_2_05a, me);
m_uiUpdateTimer = 3000;
- m_pInstance->SetData(TYPE_EVENT, 3090);
+ m_instance->SetData(TYPE_EVENT, 3090);
break;
case 4020:
DoScriptText(SAY_STAGE_3_03a, me);
m_uiUpdateTimer = 5000;
- m_pInstance->SetData(TYPE_EVENT, 4040);
+ m_instance->SetData(TYPE_EVENT, 4040);
break;
}
} else m_uiUpdateTimer -= uiDiff;
- m_pInstance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
+ m_instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
}
};
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index eda54abc7a5..e877126364e 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -74,7 +74,7 @@ public:
{
boss_novosAI(Creature* c) : Scripted_NoMovementAI(c), lSummons(me)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiTimer;
@@ -89,7 +89,7 @@ public:
CombatPhase Phase;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -107,15 +107,15 @@ public:
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_NOVOS_EVENT, NOT_STARTED);
+ instance->SetData(DATA_NOVOS_EVENT, NOT_STARTED);
for (uint8 n = 0; n < 4; ++n)
- luiCrystals.push_back(pInstance->GetData64(DATA_NOVOS_CRYSTAL_1 + n));
+ luiCrystals.push_back(instance->GetData64(DATA_NOVOS_CRYSTAL_1 + n));
for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr)
{
- if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr))
- pTemp->SetGoState(GO_STATE_READY);
+ if (GameObject* temp = instance->instance->GetGameObject(*itr))
+ temp->SetGoState(GO_STATE_READY);
}
}
}
@@ -127,14 +127,14 @@ public:
uiCrystalHandlerTimer = 30*IN_MILLISECONDS;
uiTimer = 1*IN_MILLISECONDS;
DoCast(SPELL_ARCANE_FIELD);
- if (pInstance)
+ if (instance)
{
for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr)
{
- if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr))
- pTemp->SetGoState(GO_STATE_ACTIVE);
+ if (GameObject* temp = instance->instance->GetGameObject(*itr))
+ temp->SetGoState(GO_STATE_ACTIVE);
}
- pInstance->SetData(DATA_NOVOS_EVENT, IN_PROGRESS);
+ instance->SetData(DATA_NOVOS_EVENT, IN_PROGRESS);
}
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -181,8 +181,8 @@ public:
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_NOVOS_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_NOVOS_EVENT, DONE);
lSummons.DespawnAll();
}
@@ -219,9 +219,9 @@ public:
{
if (!luiCrystals.empty())
{
- if (pInstance)
- if (GameObject* pTemp = pInstance->instance->GetGameObject(luiCrystals.back()))
- pTemp->SetGoState(GO_STATE_READY);
+ if (instance)
+ if (GameObject* temp = instance->instance->GetGameObject(luiCrystals.back()))
+ temp->SetGoState(GO_STATE_READY);
luiCrystals.pop_back();
}
if (luiCrystals.empty())
@@ -262,12 +262,12 @@ public:
{
mob_crystal_handlerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiFlashOfDarknessTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -276,7 +276,7 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0))
+ if (Creature* pNovos = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_NOVOS) : 0))
CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->RemoveCrystal();
}
@@ -298,7 +298,7 @@ public:
{
if (type != POINT_MOTION_TYPE || id != 0)
return;
- if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0))
+ if (Creature* pNovos = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_NOVOS) : 0))
if (Unit* target = CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->GetRandomTarget())
AttackStart(target);
}
@@ -319,16 +319,16 @@ public:
{
mob_novos_minionAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
void MovementInform(uint32 type, uint32 id)
{
if (type != POINT_MOTION_TYPE || id !=0)
return;
- if (Creature* Novos = ObjectAccessor::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0))
+ if (Creature* Novos = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_NOVOS) : 0))
{
Novos->AI()->DoAction(ACTION_MINION_REACHED);
if (Unit* target = CAST_AI(boss_novos::boss_novosAI, Novos->AI())->GetRandomTarget())
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 976633c2ade..e552341fd1e 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -73,7 +73,7 @@ public:
{
boss_tharon_jaAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiPhaseTimer;
@@ -86,7 +86,7 @@ public:
CombatPhase Phase;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -96,16 +96,16 @@ public:
uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS);
Phase = SKELETAL;
me->SetDisplayId(me->GetNativeDisplayId());
- if (pInstance)
- pInstance->SetData(DATA_THARON_JA_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_THARON_JA_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
@@ -155,9 +155,9 @@ public:
SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true);
for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
{
- Unit* pTemp = (*itr);
- me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp);
- pTemp->SetDisplayId(MODEL_SKELETON);
+ Unit* temp = (*itr);
+ me->AddAura(SPELL_GIFT_OF_THARON_JA, temp);
+ temp->SetDisplayId(MODEL_SKELETON);
}
uiPhaseTimer = 20*IN_MILLISECONDS;
uiLightningBreathTimer = urand(3*IN_MILLISECONDS, 4*IN_MILLISECONDS);
@@ -210,10 +210,10 @@ public:
SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true);
for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
{
- Unit* pTemp = (*itr);
- if (pTemp->HasAura(SPELL_GIFT_OF_THARON_JA))
- pTemp->RemoveAura(SPELL_GIFT_OF_THARON_JA);
- pTemp->DeMorph();
+ Unit* temp = (*itr);
+ if (temp->HasAura(SPELL_GIFT_OF_THARON_JA))
+ temp->RemoveAura(SPELL_GIFT_OF_THARON_JA);
+ temp->DeMorph();
}
} else uiPhaseTimer -= diff;
break;
@@ -229,17 +229,17 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
+ if (instance)
{
// clean morph on players
- Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers();
+ Map::PlayerList const &PlayerList = instance->instance->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* player = i->getSource())
player->DeMorph();
- pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK);
+ instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, SPELL_ACHIEVEMENT_CHECK);
- pInstance->SetData(DATA_THARON_JA_EVENT, DONE);
+ instance->SetData(DATA_THARON_JA_EVENT, DONE);
}
}
};
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index aa7d1434080..fdd27c73171 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -63,7 +63,7 @@ public:
{
boss_trollgoreAI(Creature* c) : ScriptedAI(c), lSummons(me)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiConsumeTimer;
@@ -77,7 +77,7 @@ public:
SummonList lSummons;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -94,16 +94,16 @@ public:
me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA));
- if (pInstance)
- pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
@@ -162,8 +162,8 @@ public:
lSummons.DespawnAll();
- if (pInstance)
- pInstance->SetData(DATA_TROLLGORE_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_TROLLGORE_EVENT, DONE);
}
uint32 GetData(uint32 type)
diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
index c2217f0cb23..865f98a0203 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -49,7 +49,7 @@ public:
struct instance_drak_tharon_InstanceScript : public InstanceScript
{
- instance_drak_tharon_InstanceScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_drak_tharon_InstanceScript(Map* map) : InstanceScript(map) {}
uint8 uiDredAchievCounter;
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index 9a37465fc1b..f6062951228 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -156,11 +156,11 @@ public:
{
npc_sylvanas_fosAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
EventMap events;
Phase phase;
@@ -189,7 +189,7 @@ public:
{
if (phase == PHASE_INTRO)
{
- if (!pInstance)
+ if (!instance)
return;
events.Update(diff);
@@ -282,11 +282,11 @@ public:
{
npc_jaina_fosAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
EventMap events;
Phase phase;
@@ -315,7 +315,7 @@ public:
{
if (phase == PHASE_INTRO)
{
- if (!pInstance)
+ if (!instance)
return;
events.Update(diff);
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index b8eb274280c..2eab25c51c1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -67,15 +67,15 @@ public:
uiHopelessnessCount = 0;
- if (pInstance)
- pInstance->SetData(DATA_FALRIC_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_FALRIC_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS);
events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000);
events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000);
@@ -86,8 +86,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_FALRIC_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_FALRIC_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index da5fe591aa1..eb8b0d06146 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -63,15 +63,15 @@ public:
{
boss_horAI::Reset();
- if (pInstance)
- pInstance->SetData(DATA_MARWYN_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_MARWYN_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS);
events.ScheduleEvent(EVENT_OBLITERATE, 30000); // TODO Check timer
events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000);
@@ -83,8 +83,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_MARWYN_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_MARWYN_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 1f79f53ca86..cd9037d6489 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -207,10 +207,10 @@ public:
{
npc_jaina_or_sylvanas_horAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint64 uiUther;
uint64 uiLichKing;
@@ -249,7 +249,7 @@ public:
case EVENT_START_INTRO:
me->GetMotionMaster()->MovePoint(0, MoveThronePos);
// Begining of intro is differents between factions as the speech sequence and timers are differents.
- if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
+ if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
events.ScheduleEvent(EVENT_INTRO_A2_1, 0);
else
events.ScheduleEvent(EVENT_INTRO_H2_1, 0);
@@ -266,7 +266,7 @@ public:
break;
case EVENT_INTRO_A2_3:
// TODO: she's doing some kind of spell casting emote
- pInstance->HandleGameObject(pInstance->GetData64(DATA_FROSTMOURNE), true);
+ instance->HandleGameObject(instance->GetData64(DATA_FROSTMOURNE), true);
events.ScheduleEvent(EVENT_INTRO_A2_4, 10000);
break;
case EVENT_INTRO_A2_4:
@@ -441,7 +441,7 @@ public:
if (Creature* pUther = me->GetCreature(*me, uiUther))
{
- if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
+ if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
DoScriptText(SAY_UTHER_INTRO_A2_9, pUther);
else
DoScriptText(SAY_UTHER_INTRO_H2_7, pUther);
@@ -477,9 +477,9 @@ public:
case EVENT_INTRO_LK_5:
// summon Falric and Marwyn. then go back to the door
- if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
+ if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC)))
pFalric->SetVisible(true);
- if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
+ if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN)))
pMarwyn->SetVisible(true);
if (Creature* pLichKing = me->GetCreature(*me, uiLichKing))
@@ -492,28 +492,28 @@ public:
break;
case EVENT_INTRO_LK_6:
- if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
+ if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC)))
DoScriptText(SAY_FALRIC_INTRO_1, pFalric);
events.ScheduleEvent(EVENT_INTRO_LK_7, 2000);
break;
case EVENT_INTRO_LK_7:
- if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
+ if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN)))
DoScriptText(SAY_MARWYN_INTRO_1, pMarwyn);
events.ScheduleEvent(EVENT_INTRO_LK_8, 2000);
break;
case EVENT_INTRO_LK_8:
- if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
+ if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC)))
DoScriptText(SAY_FALRIC_INTRO_2, pFalric);
events.ScheduleEvent(EVENT_INTRO_LK_9, 5000);
break;
case EVENT_INTRO_LK_9:
- if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
+ if (instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
DoScriptText(SAY_JAINA_INTRO_END, me);
else
DoScriptText(SAY_SYLVANAS_INTRO_END, me);
@@ -524,8 +524,8 @@ public:
break;
case EVENT_INTRO_END:
- if (pInstance)
- pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave
+ if (instance)
+ instance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave
// Loralen or Koreln disappearAndDie()
me->DisappearAndDie();
@@ -534,9 +534,9 @@ public:
case EVENT_SKIP_INTRO:
// TODO: implement
- if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
+ if (Creature* pFalric = me->GetCreature(*me, instance->GetData64(DATA_FALRIC)))
pFalric->SetVisible(true);
- if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
+ if (Creature* pMarwyn = me->GetCreature(*me, instance->GetData64(DATA_MARWYN)))
pMarwyn->SetVisible(true);
me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos);
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index 6237d7d57b0..2aab61b006c 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -81,10 +81,10 @@ struct boss_horAI : ScriptedAI
{
boss_horAI(Creature* creature) : ScriptedAI(creature), summons(creature)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
EventMap events;
SummonList summons;
@@ -96,7 +96,7 @@ struct boss_horAI : ScriptedAI
me->SetReactState(REACT_PASSIVE);
}
- void DamageTaken(Unit* /*pWho*/, uint32 &uiDamage)
+ void DamageTaken(Unit* /*who*/, uint32 &uiDamage)
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
uiDamage = 0;
@@ -147,9 +147,9 @@ struct boss_horAI : ScriptedAI
if (summons.empty())
{
if (summoned->isAlive())
- pInstance->SetData(DATA_WAVE_COUNT, NOT_STARTED);
+ instance->SetData(DATA_WAVE_COUNT, NOT_STARTED);
else
- pInstance->SetData(DATA_WAVE_COUNT, SPECIAL);
+ instance->SetData(DATA_WAVE_COUNT, SPECIAL);
}
}
};
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 8e7155603eb..655856208cc 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -101,14 +101,14 @@ class instance_halls_of_reflection : public InstanceMapScript
public:
instance_halls_of_reflection() : InstanceMapScript("instance_halls_of_reflection", 668) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_halls_of_reflection_InstanceMapScript(pMap);
+ return new instance_halls_of_reflection_InstanceMapScript(map);
}
struct instance_halls_of_reflection_InstanceMapScript : public InstanceScript
{
- instance_halls_of_reflection_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {};
+ instance_halls_of_reflection_InstanceMapScript(Map* map) : InstanceScript(map) {};
uint64 uiFalric;
uint64 uiMarwyn;
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index fa52f5d9505..1b40dab2aad 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -43,7 +43,7 @@ public:
{
boss_eckAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiBerserkTimer;
@@ -53,7 +53,7 @@ public:
bool bBerserk;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -64,14 +64,14 @@ public:
bBerserk = false;
- if (pInstance)
- pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
- if (pInstance)
- pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
@@ -126,8 +126,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE);
}
};
@@ -147,17 +147,17 @@ public:
{
npc_ruins_dwellerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
void JustDied(Unit* /*who*/)
{
- if (pInstance)
+ if (instance)
{
- pInstance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID());
- if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0)
+ instance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID());
+ if (instance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0)
me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS);
}
}
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index 35bfbf49bde..ea1ac951eb6 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -77,7 +77,7 @@ public:
{
boss_gal_darahAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiStampedeTimer;
@@ -96,7 +96,7 @@ public:
bool bStartOfTransformation;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -118,16 +118,16 @@ public:
me->SetDisplayId(DISPLAY_TROLL);
- if (pInstance)
- pInstance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
@@ -269,8 +269,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_GAL_DARAH_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_GAL_DARAH_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index ad973375c58..07ade9c0201 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -59,10 +59,10 @@ public:
{
boss_moorabiAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bPhase;
@@ -79,8 +79,8 @@ public:
uiTransformationTImer = 12*IN_MILLISECONDS;
bPhase = false;
- if (pInstance)
- pInstance->SetData(DATA_MOORABI_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_MOORABI_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -88,8 +88,8 @@ public:
DoScriptText(SAY_AGGRO, me);
DoCast(me, SPELL_MOJO_FRENZY, true);
- if (pInstance)
- pInstance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 uiDiff)
@@ -155,8 +155,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_MOORABI_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_MOORABI_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 94b5fda5894..7e417a840f2 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -79,7 +79,7 @@ public:
{
boss_slad_ranAI(Creature* c) : ScriptedAI(c), lSummons(me)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiPoisonNovaTimer;
@@ -91,7 +91,7 @@ public:
SummonList lSummons;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -103,16 +103,16 @@ public:
lSummons.DespawnAll();
- if (pInstance)
- pInstance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
@@ -172,8 +172,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_SLAD_RAN_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -222,7 +222,7 @@ public:
} else uiGripOfSladRanTimer -= diff;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
};
};
@@ -243,7 +243,7 @@ public:
uint32 uiVenomousBiteTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
index 690b0f0a35e..d4c55d80dc0 100644
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -33,16 +33,16 @@ class instance_gundrak : public InstanceMapScript
public:
instance_gundrak() : InstanceMapScript("instance_gundrak", 604) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_gundrak_InstanceMapScript(pMap);
+ return new instance_gundrak_InstanceMapScript(map);
}
struct instance_gundrak_InstanceMapScript : public InstanceScript
{
- instance_gundrak_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
+ instance_gundrak_InstanceMapScript(Map* map) : InstanceScript(map)
{
- bHeroicMode = pMap->IsHeroic();
+ bHeroicMode = map->IsHeroic();
}
bool bHeroicMode;
@@ -521,30 +521,30 @@ public:
bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{
- InstanceScript* pInstance = pGO->GetInstanceScript();
+ InstanceScript* instance = pGO->GetInstanceScript();
uint64 uiStatue = 0;
pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
pGO->SetGoState(GO_STATE_ACTIVE);
- if (pInstance)
+ if (instance)
{
switch (pGO->GetEntry())
{
case 192518:
- uiStatue = pInstance->GetData64(DATA_SLAD_RAN_STATUE);
+ uiStatue = instance->GetData64(DATA_SLAD_RAN_STATUE);
break;
case 192519:
- uiStatue = pInstance->GetData64(DATA_MOORABI_STATUE);
+ uiStatue = instance->GetData64(DATA_MOORABI_STATUE);
break;
case 192520:
- uiStatue = pInstance->GetData64(DATA_DRAKKARI_COLOSSUS_STATUE);
+ uiStatue = instance->GetData64(DATA_DRAKKARI_COLOSSUS_STATUE);
break;
}
- if (!pInstance->GetData64(DATA_STATUE_ACTIVATE))
+ if (!instance->GetData64(DATA_STATUE_ACTIVATE))
{
- pInstance->SetData64(DATA_STATUE_ACTIVATE, uiStatue);
+ instance->SetData64(DATA_STATUE_ACTIVATE, uiStatue);
pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
pGO->SetGoState(GO_STATE_ACTIVE);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 44d608be46e..1688624be91 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -712,10 +712,6 @@ class boss_the_lich_king : public CreatureScript
summon->SetReactState(REACT_PASSIVE);
summon->CastSpell(summon, SPELL_DEFILE_AURA, false);
break;
- case NPC_VALKYR_SHADOWGUARD:
- summon->CastSpell(summon, SPELL_WINGS_OF_THE_DAMNED, true);
- summon->CastSpell(summon, SPELL_VALKYR_TARGET_SEARCH, true);
- break;
case NPC_FROSTMOURNE_TRIGGER:
{
summons.Summon(summon);
@@ -1479,6 +1475,7 @@ class npc_valkyr_shadowguard : public CreatureScript
{
_events.Reset();
me->SetReactState(REACT_PASSIVE);
+ DoCast(me, SPELL_WINGS_OF_THE_DAMNED, false);
me->SetSpeed(MOVE_FLIGHT, 0.642857f, true);
}
@@ -1558,7 +1555,6 @@ class npc_valkyr_shadowguard : public CreatureScript
void SetGUID(uint64 guid, int32 /* = 0*/)
{
_grabbedPlayer = guid;
- _events.Reset();
}
void UpdateAI(uint32 const diff)
@@ -1576,8 +1572,11 @@ class npc_valkyr_shadowguard : public CreatureScript
switch (eventId)
{
case EVENT_GRAB_PLAYER:
- DoCastAOE(SPELL_VALKYR_TARGET_SEARCH);
- _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000);
+ if (!_grabbedPlayer)
+ {
+ DoCastAOE(SPELL_VALKYR_TARGET_SEARCH);
+ _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000);
+ }
break;
case EVENT_MOVE_TO_DROP_POS:
me->GetMotionMaster()->MovePoint(POINT_DROP_PLAYER, _dropPoint);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 7307fad3701..9c3c9156d63 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -663,11 +663,11 @@ public:
if (player->isGameMaster())
return false;
- InstanceScript* pInstance = player->GetInstanceScript();
- if (!pInstance || pInstance->IsEncounterInProgress() || pInstance->GetBossState(BOSS_KELTHUZAD) == DONE)
+ InstanceScript* instance = player->GetInstanceScript();
+ if (!instance || instance->IsEncounterInProgress() || instance->GetBossState(BOSS_KELTHUZAD) == DONE)
return false;
- Creature* pKelthuzad = CAST_CRE(Unit::GetUnit(*player, pInstance->GetData64(DATA_KELTHUZAD)));
+ Creature* pKelthuzad = CAST_CRE(Unit::GetUnit(*player, instance->GetData64(DATA_KELTHUZAD)));
if (!pKelthuzad)
return false;
@@ -676,7 +676,7 @@ public:
return false;
pKelthuzadAI->AttackStart(player);
- if (GameObject* trigger = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_TRIGGER)))
+ if (GameObject* trigger = instance->instance->GetGameObject(instance->GetData64(DATA_KELTHUZAD_TRIGGER)))
{
if (trigger->getLootState() == GO_READY)
trigger->UseDoorOrButton();
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index ce9f55ae0b6..d620289a72f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -84,7 +84,7 @@ public:
boss_sapphironAI(Creature* c) : BossAI(c, BOSS_SAPPHIRON)
, phase(PHASE_NULL)
{
- pMap = me->GetMap();
+ map = me->GetMap();
}
Phases phase;
@@ -93,7 +93,7 @@ public:
bool CanTheHundredClub; // needed for achievement: The Hundred Club(2146, 2147)
uint32 CheckFrostResistTimer;
- Map* pMap;
+ Map* map;
void InitializeAI()
{
@@ -156,9 +156,9 @@ public:
AchievementEntry const* AchievTheHundredClub = GetAchievementStore()->LookupEntry(ACHIEVEMENT_THE_HUNDRED_CLUB);
if (AchievTheHundredClub)
{
- if (pMap && pMap->IsDungeon())
+ if (map && map->IsDungeon())
{
- Map::PlayerList const &players = pMap->GetPlayers();
+ Map::PlayerList const &players = map->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievTheHundredClub);
}
@@ -183,9 +183,9 @@ public:
void CheckPlayersFrostResist()
{
- if (CanTheHundredClub && pMap && pMap->IsDungeon())
+ if (CanTheHundredClub && map && map->IsDungeon())
{
- Map::PlayerList const &players = pMap->GetPlayers();
+ Map::PlayerList const &players = map->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE)
@@ -215,8 +215,8 @@ public:
{
if (Player* player = Unit::GetPlayer(*me, itr->first))
player->RemoveAura(SPELL_ICEBOLT);
- if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second))
- pGo->Delete();
+ if (GameObject* go = GameObject::GetGameObject(*me, itr->second))
+ go->Delete();
}
iceblocks.clear();
}
@@ -373,10 +373,10 @@ public:
for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
{
- if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second))
+ if (GameObject* go = GameObject::GetGameObject(*me, itr->second))
{
- if (pGo->IsInBetween(me, target, 2.0f)
- && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f)
+ if (go->IsInBetween(me, target, 2.0f)
+ && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(go->GetPositionX(), go->GetPositionY()) < 5.0f)
{
target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true);
targets.push_back(target);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index b8058afe488..c2099b1346b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -268,18 +268,18 @@ public:
{
mob_stalaggAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 powerSurgeTimer;
uint32 magneticPullTimer;
void Reset()
{
- if (pInstance)
- if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS)))
+ if (instance)
+ if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
if (pThaddius->AI())
pThaddius->AI()->DoAction(ACTION_STALAGG_RESET);
powerSurgeTimer = urand(20000, 25000);
@@ -293,8 +293,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS)))
+ if (instance)
+ if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
if (pThaddius->AI())
pThaddius->AI()->DoAction(ACTION_STALAGG_DIED);
}
@@ -306,7 +306,7 @@ public:
if (magneticPullTimer <= uiDiff)
{
- if (Creature* pFeugen = me->GetCreature(*me, pInstance->GetData64(DATA_FEUGEN)))
+ if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
{
Unit* pStalaggVictim = me->getVictim();
Unit* pFeugenVictim = pFeugen->getVictim();
@@ -354,17 +354,17 @@ public:
{
mob_feugenAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 staticFieldTimer;
void Reset()
{
- if (pInstance)
- if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS)))
+ if (instance)
+ if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
if (pThaddius->AI())
pThaddius->AI()->DoAction(ACTION_FEUGEN_RESET);
staticFieldTimer = 5000;
@@ -377,8 +377,8 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- if (Creature* pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS)))
+ if (instance)
+ if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
if (pThaddius->AI())
pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED);
}
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index db9fbc5a0a1..077aa708e14 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -107,14 +107,14 @@ class instance_naxxramas : public InstanceMapScript
public:
instance_naxxramas() : InstanceMapScript("instance_naxxramas", 533) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_naxxramas_InstanceMapScript(pMap);
+ return new instance_naxxramas_InstanceMapScript(map);
}
struct instance_naxxramas_InstanceMapScript : public InstanceScript
{
- instance_naxxramas_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
+ instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetBossNumber(MAX_BOSS_NUMBER);
LoadDoorData(doorData);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 1a153474416..caf6b64eea7 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -63,10 +63,10 @@ public:
{
boss_keristraszaAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
std::list<uint64> intenseColdList;
uint64 auiContainmentSphereGUIDs[DATA_CONTAINMENT_SPHERES];
@@ -90,8 +90,8 @@ public:
RemovePrison(CheckContainmentSpheres());
- if (pInstance)
- pInstance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -99,16 +99,16 @@ public:
DoScriptText(SAY_AGGRO, me);
DoCastAOE(SPELL_INTENSE_COLD);
- if (pInstance)
- pInstance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_KERISTRASZA_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_KERISTRASZA_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -118,18 +118,18 @@ public:
bool CheckContainmentSpheres(bool remove_prison = false)
{
- if (!pInstance)
+ if (!instance)
return false;
- auiContainmentSphereGUIDs[0] = pInstance->GetData64(ANOMALUS_CONTAINMET_SPHERE);
- auiContainmentSphereGUIDs[1] = pInstance->GetData64(ORMOROKS_CONTAINMET_SPHERE);
- auiContainmentSphereGUIDs[2] = pInstance->GetData64(TELESTRAS_CONTAINMET_SPHERE);
+ auiContainmentSphereGUIDs[0] = instance->GetData64(ANOMALUS_CONTAINMET_SPHERE);
+ auiContainmentSphereGUIDs[1] = instance->GetData64(ORMOROKS_CONTAINMET_SPHERE);
+ auiContainmentSphereGUIDs[2] = instance->GetData64(TELESTRAS_CONTAINMET_SPHERE);
GameObject* ContainmentSpheres[DATA_CONTAINMENT_SPHERES];
for (uint8 i = 0; i < DATA_CONTAINMENT_SPHERES; ++i)
{
- ContainmentSpheres[i] = pInstance->instance->GetGameObject(auiContainmentSphereGUIDs[i]);
+ ContainmentSpheres[i] = instance->instance->GetGameObject(auiContainmentSphereGUIDs[i]);
if (!ContainmentSpheres[i])
return false;
if (ContainmentSpheres[i]->GetGoState() != GO_STATE_ACTIVE)
@@ -210,9 +210,9 @@ public:
bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{
- InstanceScript* pInstance = pGO->GetInstanceScript();
+ InstanceScript* instance = pGO->GetInstanceScript();
- Creature* pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0);
+ Creature* pKeristrasza = Unit::GetCreature(*pGO, instance ? instance->GetData64(DATA_KERISTRASZA) : 0);
if (pKeristrasza && pKeristrasza->isAlive())
{
// maybe these are hacks :(
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 7a3605af959..1c7b538eb02 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -69,10 +69,10 @@ public:
{
boss_magus_telestraAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint64 uiFireMagusGUID;
uint64 uiFrostMagusGUID;
@@ -115,24 +115,24 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisible(true);
- if (pInstance)
- pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 386c925fab4..afbe3a123a8 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -63,10 +63,10 @@ public:
{
boss_ormorokAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bFrenzy;
bool bCrystalSpikes;
@@ -93,24 +93,24 @@ public:
bFrenzy = false;
bCrystalSpikes = false;
- if (pInstance)
- pInstance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_ORMOROK_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_ORMOROK_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -195,10 +195,10 @@ public:
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (; i != me->getThreatManager().getThreatList().end(); ++i)
{
- Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid());
- if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer)
+ Unit* temp = Unit::GetUnit((*me), (*i)->getUnitGuid());
+ if (temp && temp->GetTypeId() == TYPEID_PLAYER && temp->getClass() == Healer)
{
- target = pTemp;
+ target = temp;
break;
}
}
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index d2130a4bada..cb81c5d54fe 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -31,14 +31,14 @@ class instance_nexus : public InstanceMapScript
public:
instance_nexus() : InstanceMapScript("instance_nexus", 576) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_nexus_InstanceMapScript(pMap);
+ return new instance_nexus_InstanceMapScript(map);
}
struct instance_nexus_InstanceMapScript : public InstanceScript
{
- instance_nexus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS];
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index a2db75d1600..e6b3416b89c 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -31,14 +31,14 @@ class instance_oculus : public InstanceMapScript
public:
instance_oculus() : InstanceMapScript("instance_oculus", 578) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_oculus_InstanceMapScript(pMap);
+ return new instance_oculus_InstanceMapScript(map);
}
struct instance_oculus_InstanceMapScript : public InstanceScript
{
- instance_oculus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map) {}
void Initialize()
{
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index c091906d490..8c97766f787 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -95,12 +95,12 @@ public:
{
boss_bjarngrimAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = creature->GetInstanceScript();
+ m_instance = creature->GetInstanceScript();
m_uiStance = STANCE_DEFENSIVE;
memset(&m_auiStormforgedLieutenantGUID, 0, sizeof(m_auiStormforgedLieutenantGUID));
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
bool m_bIsChangingStance;
@@ -163,8 +163,8 @@ public:
SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED);
+ if (m_instance)
+ m_instance->SetData(TYPE_BJARNGRIM, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -174,8 +174,8 @@ public:
//must get both lieutenants here and make sure they are with him
me->CallForHelp(30.0f);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_BJARNGRIM, IN_PROGRESS);
+ if (m_instance)
+ m_instance->SetData(TYPE_BJARNGRIM, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
@@ -187,8 +187,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_BJARNGRIM, DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_BJARNGRIM, DONE);
}
//TODO: remove when removal is done by the core
@@ -371,10 +371,10 @@ public:
{
mob_stormforged_lieutenantAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = creature->GetInstanceScript();
+ m_instance = creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
uint32 m_uiArcWeld_Timer;
uint32 m_uiRenewSteel_Timer;
@@ -387,9 +387,9 @@ public:
void EnterCombat(Unit* who)
{
- if (m_pInstance)
+ if (m_instance)
{
- if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM)))
+ if (Creature* pBjarngrim = m_instance->instance->GetCreature(m_instance->GetData64(DATA_BJARNGRIM)))
{
if (pBjarngrim->isAlive() && !pBjarngrim->getVictim())
pBjarngrim->AI()->AttackStart(who);
@@ -413,9 +413,9 @@ public:
if (m_uiRenewSteel_Timer <= uiDiff)
{
- if (m_pInstance)
+ if (m_instance)
{
- if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM)))
+ if (Creature* pBjarngrim = m_instance->instance->GetCreature(m_instance->GetData64(DATA_BJARNGRIM)))
{
if (pBjarngrim->isAlive())
DoCast(pBjarngrim, SPELL_RENEW_STEEL_N);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index 21a84ba0083..e7f8ad4e5e8 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -80,10 +80,10 @@ public:
{
boss_ionarAI(Creature* creature) : ScriptedAI(creature), lSparkList(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
SummonList lSparkList;
@@ -116,16 +116,16 @@ public:
if (!me->IsVisible())
me->SetVisible(true);
- if (pInstance)
- pInstance->SetData(TYPE_IONAR, NOT_STARTED);
+ if (instance)
+ instance->SetData(TYPE_IONAR, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(TYPE_IONAR, IN_PROGRESS);
+ if (instance)
+ instance->SetData(TYPE_IONAR, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
@@ -134,8 +134,8 @@ public:
lSparkList.DespawnAll();
- if (pInstance)
- pInstance->SetData(TYPE_IONAR, DONE);
+ if (instance)
+ instance->SetData(TYPE_IONAR, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -310,10 +310,10 @@ public:
{
mob_spark_of_ionarAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiCheckTimer;
@@ -325,7 +325,7 @@ public:
void MovementInform(uint32 uiType, uint32 uiPointId)
{
- if (uiType != POINT_MOTION_TYPE || !pInstance)
+ if (uiType != POINT_MOTION_TYPE || !instance)
return;
if (uiPointId == DATA_POINT_CALLBACK)
@@ -340,7 +340,7 @@ public:
void UpdateAI(const uint32 uiDiff)
{
// Despawn if the encounter is not running
- if (pInstance && pInstance->GetData(TYPE_IONAR) != IN_PROGRESS)
+ if (instance && instance->GetData(TYPE_IONAR) != IN_PROGRESS)
{
me->DespawnOrUnsummon();
return;
@@ -349,9 +349,9 @@ public:
// Prevent them to follow players through the whole instance
if (uiCheckTimer <= uiDiff)
{
- if (pInstance)
+ if (instance)
{
- Creature* pIonar = pInstance->instance->GetCreature(pInstance->GetData64(DATA_IONAR));
+ Creature* pIonar = instance->instance->GetCreature(instance->GetData64(DATA_IONAR));
if (pIonar && pIonar->isAlive())
{
if (me->GetDistance(pIonar) > DATA_MAX_SPARK_DISTANCE)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 4e386ff9c17..a5ea1868686 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -72,10 +72,10 @@ public:
{
boss_lokenAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = creature->GetInstanceScript();
+ m_instance = creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
bool m_bIsAura;
@@ -97,10 +97,10 @@ public:
m_uiHealthAmountModifier = 1;
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->SetData(TYPE_LOKEN, NOT_STARTED);
- m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
+ m_instance->SetData(TYPE_LOKEN, NOT_STARTED);
+ m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
}
}
@@ -108,10 +108,10 @@ public:
{
DoScriptText(SAY_AGGRO, me);
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->SetData(TYPE_LOKEN, IN_PROGRESS);
- m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
+ m_instance->SetData(TYPE_LOKEN, IN_PROGRESS);
+ m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
}
}
@@ -119,8 +119,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_LOKEN, DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_LOKEN, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -139,10 +139,10 @@ public:
// workaround for PULSING_SHOCKWAVE
if (m_uiPulsingShockwave_Timer <= uiDiff)
{
- Map* pMap = me->GetMap();
- if (pMap->IsDungeon())
+ Map* map = me->GetMap();
+ if (map->IsDungeon())
{
- Map::PlayerList const &PlayerList = pMap->GetPlayers();
+ Map::PlayerList const &PlayerList = map->GetPlayers();
if (PlayerList.isEmpty())
return;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index d15d9ee6900..719d74a3bde 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -83,10 +83,10 @@ public:
{
boss_volkhanAI(Creature* creature) : ScriptedAI(creature)
{
- m_pInstance = creature->GetInstanceScript();
+ m_instance = creature->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
std::list<uint64> m_lGolemGUIDList;
@@ -121,16 +121,16 @@ public:
DespawnGolem();
m_lGolemGUIDList.clear();
- if (m_pInstance)
- m_pInstance->SetData(TYPE_VOLKHAN, NOT_STARTED);
+ if (m_instance)
+ m_instance->SetData(TYPE_VOLKHAN, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (m_pInstance)
- m_pInstance->SetData(TYPE_VOLKHAN, IN_PROGRESS);
+ if (m_instance)
+ m_instance->SetData(TYPE_VOLKHAN, IN_PROGRESS);
}
void AttackStart(Unit* who)
@@ -151,18 +151,18 @@ public:
DoScriptText(SAY_DEATH, me);
DespawnGolem();
- if (m_pInstance)
- m_pInstance->SetData(TYPE_VOLKHAN, DONE);
+ if (m_instance)
+ m_instance->SetData(TYPE_VOLKHAN, DONE);
if (IsHeroic() && GolemsShattered < 5)
{
AchievementEntry const* AchievShatterResistant = GetAchievementStore()->LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT);
if (AchievShatterResistant)
{
- Map* pMap = me->GetMap();
- if (pMap && pMap->IsDungeon())
+ Map* map = me->GetMap();
+ if (map && map->IsDungeon())
{
- Map::PlayerList const &players = pMap->GetPlayers();
+ Map::PlayerList const &players = map->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievShatterResistant);
}
@@ -182,10 +182,10 @@ public:
for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
{
- if (pTemp->isAlive())
- pTemp->DespawnOrUnsummon();
+ if (temp->isAlive())
+ temp->DespawnOrUnsummon();
}
}
@@ -199,12 +199,12 @@ public:
for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
{
// Only shatter brittle golems
- if (pTemp->isAlive() && pTemp->GetEntry() == NPC_BRITTLE_GOLEM)
+ if (temp->isAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM)
{
- pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false);
+ temp->CastSpell(temp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false);
GolemsShattered += 1;
}
}
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index 8d7731b3eee..c5c7f9546ba 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -38,14 +38,14 @@ class instance_halls_of_lightning : public InstanceMapScript
public:
instance_halls_of_lightning() : InstanceMapScript("instance_halls_of_lightning", 602) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_halls_of_lightning_InstanceMapScript(pMap);
+ return new instance_halls_of_lightning_InstanceMapScript(map);
}
struct instance_halls_of_lightning_InstanceMapScript : public InstanceScript
{
- instance_halls_of_lightning_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_halls_of_lightning_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index fdb938fb1ef..375862c141c 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -63,7 +63,7 @@ public:
{
boss_krystallusAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiBoulderTossTimer;
@@ -74,7 +74,7 @@ public:
bool bIsSlam;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -86,15 +86,15 @@ public:
uiStompTimer = 20000 + rand()%9000;
uiShatterTimer = 0;
- if (pInstance)
- pInstance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
@@ -146,8 +146,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_KRYSTALLUS_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index dcd71e41432..4ab09dbf67a 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -67,10 +67,10 @@ public:
{
boss_maiden_of_griefAI(Creature* c) : ScriptedAI(c)
{
- pInstance = me->GetInstanceScript();
+ instance = me->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 PartingSorrowTimer;
uint32 StormOfGriefTimer;
@@ -84,10 +84,10 @@ public:
ShockOfSorrowTimer = 20000+rand()%5000;
PillarOfWoeTimer = 5000 + rand()%10000;
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED);
- pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
+ instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED);
+ instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
}
}
@@ -95,17 +95,17 @@ public:
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_MAIDEN_DOOR)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS);
- pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
+ instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS);
+ instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
}
}
@@ -161,8 +161,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index e8d6bd9f214..41dcd77d4bc 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -92,7 +92,7 @@ public:
{
boss_sjonnirAI(Creature* c) : ScriptedAI(c), lSummons(me)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
bool bIsFrenzy;
@@ -108,7 +108,7 @@ public:
SummonList lSummons;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -125,8 +125,8 @@ public:
lSummons.DespawnAll();
- if (pInstance)
- pInstance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
@@ -135,16 +135,16 @@ public:
uiEncounterTimer = 0;
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_SJONNIR_DOOR)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
+ instance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
}
}
@@ -219,8 +219,8 @@ public:
DoScriptText(SAY_DEATH, me);
lSummons.DespawnAll();
- if (pInstance)
- pInstance->SetData(DATA_SJONNIR_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_SJONNIR_EVENT, DONE);
}
void KilledUnit(Unit* victim)
{
@@ -271,10 +271,10 @@ public:
{
if (uiMergeTimer <= diff)
{
- if (Creature* pTemp = me->FindNearestCreature(CREATURE_MALFORMED_OOZE, 3.0f, true))
+ if (Creature* temp = me->FindNearestCreature(CREATURE_MALFORMED_OOZE, 3.0f, true))
{
DoSpawnCreature(CREATURE_IRON_SLUDGE, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000);
- pTemp->DisappearAndDie();
+ temp->DisappearAndDie();
me->DisappearAndDie();
}
uiMergeTimer = 3000;
@@ -303,15 +303,15 @@ public:
{
mob_iron_sludgeAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- if (Creature* Sjonnir = ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_SJONNIR)))
+ if (instance)
+ if (Creature* Sjonnir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SJONNIR)))
Sjonnir->AI()->DoAction(ACTION_OOZE_DEAD);
}
};
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index e5f3cfd7229..ec1464a5d6f 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -144,11 +144,11 @@ public:
{
mob_tribuna_controllerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
SetCombatMovement(false);
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiKaddrakEncounterTimer;
uint32 uiMarnakEncounterTimer;
@@ -170,12 +170,12 @@ public:
bMarnakActivated = false;
bAbedneumActivated = false;
- if (pInstance)
+ if (instance)
{
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false);
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false);
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false);
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), false);
}
KaddrakGUIDList.clear();
@@ -300,7 +300,7 @@ public:
{
npc_brann_hosAI(Creature* c) : npc_escortAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiStep;
@@ -309,7 +309,7 @@ public:
uint64 uiControllerGUID;
std::list<uint64> lDwarfGUIDList;
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bIsBattle;
bool bIsLowHP;
@@ -328,8 +328,8 @@ public:
DespawnDwarf();
- if (pInstance)
- pInstance->SetData(DATA_BRANN_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_BRANN_EVENT, NOT_STARTED);
}
}
@@ -339,9 +339,9 @@ public:
return;
for (std::list<uint64>::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr)
{
- Creature* pTemp = Unit::GetCreature(*me, pInstance ? (*itr) : 0);
- if (pTemp && pTemp->isAlive())
- pTemp->DespawnOrUnsummon();
+ Creature* temp = Unit::GetCreature(*me, instance ? (*itr) : 0);
+ if (temp && temp->isAlive())
+ temp->DespawnOrUnsummon();
}
lDwarfGUIDList.clear();
}
@@ -366,8 +366,8 @@ public:
break;
case 17:
DoScriptText(SAY_EVENT_INTRO_2, me);
- if (pInstance)
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true);
+ if (instance)
+ instance->HandleGameObject(instance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true);
me->SetStandState(UNIT_STAND_STATE_KNEEL);
SetEscortPaused(true);
JumpToNextStep(8500);
@@ -442,11 +442,11 @@ public:
switch (uiStep)
{
case 1:
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_BRANN_EVENT) != NOT_STARTED)
+ if (instance->GetData(DATA_BRANN_EVENT) != NOT_STARTED)
return;
- pInstance->SetData(DATA_BRANN_EVENT, IN_PROGRESS);
+ instance->SetData(DATA_BRANN_EVENT, IN_PROGRESS);
}
bIsBattle = false;
DoScriptText(SAY_ESCORT_START, me);
@@ -458,9 +458,9 @@ public:
JumpToNextStep(0);
break;
case 5:
- if (pInstance)
- if (Creature* pTemp = (Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))))
- DoScriptText(SAY_EVENT_INTRO_3_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = (Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))))
+ DoScriptText(SAY_EVENT_INTRO_3_ABED, temp);
JumpToNextStep(8500);
break;
case 6:
@@ -468,17 +468,17 @@ public:
JumpToNextStep(6500);
break;
case 7:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK)))
- DoScriptText(SAY_EVENT_A_2_KADD, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+ DoScriptText(SAY_EVENT_A_2_KADD, temp);
JumpToNextStep(12500);
break;
case 8:
DoScriptText(SAY_EVENT_A_3, me);
- if (pInstance)
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), true);
- if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID))
- CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true;
+ if (instance)
+ instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true);
+ if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+ CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true;
JumpToNextStep(5000);
break;
case 9:
@@ -491,18 +491,18 @@ public:
JumpToNextStep(6000);
break;
case 11:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK)))
- DoScriptText(SAY_EVENT_B_2_MARN, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+ DoScriptText(SAY_EVENT_B_2_MARN, temp);
SpawnDwarf(1);
JumpToNextStep(20000);
break;
case 12:
DoScriptText(SAY_EVENT_B_3, me);
- if (pInstance)
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), true);
- if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID))
- CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true;
+ if (instance)
+ instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true);
+ if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+ CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bMarnakActivated = true;
JumpToNextStep(10000);
break;
case 13:
@@ -523,18 +523,18 @@ public:
JumpToNextStep(20000);
break;
case 17:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_C_2_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_C_2_ABED, temp);
SpawnDwarf(1);
JumpToNextStep(20000);
break;
case 18:
DoScriptText(SAY_EVENT_C_3, me);
- if (pInstance)
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), true);
- if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID))
- CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true;
+ if (instance)
+ instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true);
+ if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+ CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true;
JumpToNextStep(5000);
break;
case 19:
@@ -551,9 +551,9 @@ public:
JumpToNextStep(20000);
break;
case 22:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_D_2_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_D_2_ABED, temp);
SpawnDwarf(1);
JumpToNextStep(5000);
break;
@@ -575,9 +575,9 @@ public:
JumpToNextStep(10000);
break;
case 27:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_D_4_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_D_4_ABED, temp);
SpawnDwarf(1);
JumpToNextStep(10000);
break;
@@ -585,25 +585,25 @@ public:
me->SetReactState(REACT_DEFENSIVE);
DoScriptText(SAY_EVENT_END_01, me);
me->SetStandState(UNIT_STAND_STATE_STAND);
- if (pInstance)
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), true);
- if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID))
- pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+ if (instance)
+ instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), true);
+ if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+ temp->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
bIsBattle = true;
SetEscortPaused(false);
JumpToNextStep(6500);
break;
case 29:
DoScriptText(SAY_EVENT_END_02, me);
- if (pInstance)
- pInstance->SetData(DATA_BRANN_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_BRANN_EVENT, DONE);
me->CastSpell(me, SPELL_REWARD_ACHIEVEMENT, true);
JumpToNextStep(5500);
break;
case 30:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_END_03_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_END_03_ABED, temp);
JumpToNextStep(8500);
break;
case 31:
@@ -611,9 +611,9 @@ public:
JumpToNextStep(11500);
break;
case 32:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_END_05_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_END_05_ABED, temp);
JumpToNextStep(11500);
break;
case 33:
@@ -621,9 +621,9 @@ public:
JumpToNextStep(4500);
break;
case 34:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_END_07_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_END_07_ABED, temp);
JumpToNextStep(22500);
break;
case 35:
@@ -631,9 +631,9 @@ public:
JumpToNextStep(7500);
break;
case 36:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK)))
- DoScriptText(SAY_EVENT_END_09_KADD, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+ DoScriptText(SAY_EVENT_END_09_KADD, temp);
JumpToNextStep(18500);
break;
case 37:
@@ -641,9 +641,9 @@ public:
JumpToNextStep(5500);
break;
case 38:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK)))
- DoScriptText(SAY_EVENT_END_11_KADD, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+ DoScriptText(SAY_EVENT_END_11_KADD, temp);
JumpToNextStep(20500);
break;
case 39:
@@ -651,9 +651,9 @@ public:
JumpToNextStep(2500);
break;
case 40:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK)))
- DoScriptText(SAY_EVENT_END_13_KADD, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+ DoScriptText(SAY_EVENT_END_13_KADD, temp);
JumpToNextStep(19500);
break;
case 41:
@@ -661,9 +661,9 @@ public:
JumpToNextStep(10500);
break;
case 42:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK)))
- DoScriptText(SAY_EVENT_END_15_MARN, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+ DoScriptText(SAY_EVENT_END_15_MARN, temp);
JumpToNextStep(6500);
break;
case 43:
@@ -671,9 +671,9 @@ public:
JumpToNextStep(6500);
break;
case 44:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK)))
- DoScriptText(SAY_EVENT_END_17_MARN, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+ DoScriptText(SAY_EVENT_END_17_MARN, temp);
JumpToNextStep(25500);
break;
case 45:
@@ -681,9 +681,9 @@ public:
JumpToNextStep(23500);
break;
case 46:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK)))
- DoScriptText(SAY_EVENT_END_19_MARN, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+ DoScriptText(SAY_EVENT_END_19_MARN, temp);
JumpToNextStep(3500);
break;
case 47:
@@ -691,19 +691,19 @@ public:
JumpToNextStep(8500);
break;
case 48:
- if (pInstance)
- if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))
- DoScriptText(SAY_EVENT_END_21_ABED, pTemp);
+ if (instance)
+ if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+ DoScriptText(SAY_EVENT_END_21_ABED, temp);
JumpToNextStep(5500);
break;
case 49:
{
- if (pInstance)
+ if (instance)
{
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false);
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false);
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false);
- pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), false);
+ instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), false);
}
Player* player = GetPlayerForEscort();
if (player)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index e46a7dae107..ffd3706a7e5 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -32,14 +32,14 @@ class instance_halls_of_stone : public InstanceMapScript
public:
instance_halls_of_stone() : InstanceMapScript("instance_halls_of_stone", 599) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_halls_of_stone_InstanceMapScript(pMap);
+ return new instance_halls_of_stone_InstanceMapScript(map);
}
struct instance_halls_of_stone_InstanceMapScript : public InstanceScript
{
- instance_halls_of_stone_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_halls_of_stone_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 uiMaidenOfGrief;
uint64 uiKrystallus;
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
index 2c99b4d7246..3888cc43bc9 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
@@ -83,11 +83,11 @@ public:
{
boss_algalonAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
Summon = false; // not in reset. intro speech done only once.
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
std::list<uint64> m_lCollapsingStarGUIDList;
@@ -122,8 +122,8 @@ public:
uiStep = 1;
}
- if (pInstance)
- pInstance->SetData(BOSS_ALGALON, IN_PROGRESS);
+ if (instance)
+ instance->SetData(BOSS_ALGALON, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
@@ -136,8 +136,8 @@ public:
Phase = 1;
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
- if (pInstance)
- pInstance->SetData(BOSS_ALGALON, NOT_STARTED);
+ if (instance)
+ instance->SetData(BOSS_ALGALON, NOT_STARTED);
BlackHoleGUID = 0;
@@ -165,10 +165,10 @@ public:
for (std::list<uint64>::const_iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
{
- if (pTemp->isAlive())
- pTemp->DespawnOrUnsummon();
+ if (temp->isAlive())
+ temp->DespawnOrUnsummon();
}
}
m_lCollapsingStarGUIDList.clear();
@@ -217,8 +217,8 @@ public:
me->DisappearAndDie();
- if (pInstance)
- pInstance->SetData(BOSS_ALGALON, DONE);
+ if (instance)
+ instance->SetData(BOSS_ALGALON, DONE);
return;
}
@@ -342,10 +342,10 @@ public:
{
mob_collapsing_starAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 BlackHoleExplosion_Timer;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index b3e12415fdc..55211f3f047 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -85,10 +85,10 @@ public:
{
boss_ingvar_the_plundererAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bIsUndead;
bool bEventInProgress;
@@ -117,8 +117,8 @@ public:
uiSpawnResTimer = 3000;
- if (pInstance)
- pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_INGVAR_EVENT, NOT_STARTED);
}
void DamageTaken(Unit* /*done_by*/, uint32 &damage)
@@ -164,16 +164,16 @@ public:
{
DoScriptText(YELL_AGGRO_1, me);
- if (pInstance)
- pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
DoScriptText(YELL_DEAD_2, me);
- if (pInstance)
- pInstance->SetData(DATA_INGVAR_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_INGVAR_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -298,11 +298,11 @@ public:
{
mob_annhylde_the_callerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
float x, y, z;
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiResurectTimer;
uint32 uiResurectPhase;
@@ -317,7 +317,7 @@ public:
me->GetPosition(x, y, z);
DoTeleportTo(x+1, y, z+30);
- Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0);
+ Unit* ingvar = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_INGVAR) : 0);
if (ingvar)
{
me->GetMotionMaster()->MovePoint(1, x, y, z+15);
@@ -330,7 +330,7 @@ public:
{
if (type != POINT_MOTION_TYPE)
return;
- Unit* ingvar = Unit::GetUnit((*me), pInstance ? pInstance->GetData64(DATA_INGVAR) : 0);
+ Unit* ingvar = Unit::GetUnit((*me), instance ? instance->GetData64(DATA_INGVAR) : 0);
if (ingvar)
{
switch (id)
@@ -362,7 +362,7 @@ public:
{
if (uiResurectPhase == 1)
{
- Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0);
+ Unit* ingvar = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_INGVAR) : 0);
if (ingvar)
{
ingvar->SetStandState(UNIT_STAND_STATE_STAND);
@@ -373,7 +373,7 @@ public:
}
else if (uiResurectPhase == 2)
{
- if (Creature* ingvar = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0))
+ if (Creature* ingvar = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_INGVAR) : 0))
{
ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index 029ebbfe8bc..0a3f2dc3078 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -126,10 +126,10 @@ public:
{
boss_kelesethAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 FrostTombTimer;
uint32 SummonSkeletonsTimer;
@@ -148,8 +148,8 @@ public:
ResetTimer();
- if (pInstance)
- pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED);
}
void KilledUnit(Unit* victim)
@@ -169,18 +169,18 @@ public:
AchievementEntry const* AchievOnTheRocks = GetAchievementStore()->LookupEntry(ACHIEVEMENT_ON_THE_ROCKS);
if (AchievOnTheRocks)
{
- Map* pMap = me->GetMap();
- if (pMap && pMap->IsDungeon())
+ Map* map = me->GetMap();
+ if (map && map->IsDungeon())
{
- Map::PlayerList const &players = pMap->GetPlayers();
+ Map::PlayerList const &players = map->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievOnTheRocks);
}
}
}
- if (pInstance)
- pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_PRINCEKELESETH_EVENT, DONE);
}
void EnterCombat(Unit* /*who*/)
@@ -188,8 +188,8 @@ public:
DoScriptText(SAY_AGGRO, me);
DoZoneInCombat();
- if (pInstance)
- pInstance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS);
}
void ResetTimer(uint32 inc = 0)
@@ -269,10 +269,10 @@ public:
{
mob_vrykul_skeletonAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 Respawn_Time;
uint64 Target_Guid;
uint32 Decrepify_Timer;
@@ -328,7 +328,7 @@ public:
void UpdateAI(const uint32 diff)
{
- if (pInstance && pInstance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS)
+ if (instance && instance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS)
{
if (isDead)
{
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index 34825cec9bf..e828d81e05a 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -71,10 +71,10 @@ public:
{
boss_skarvald_the_constructorAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool ghost;
uint32 Charge_Timer;
@@ -91,42 +91,42 @@ public:
Check_Timer = 5000;
ghost = (me->GetEntry() == MOB_SKARVALD_GHOST);
- if (!ghost && pInstance)
+ if (!ghost && instance)
{
- Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN));
+ Unit* dalronn = Unit::GetUnit((*me), instance->GetData64(DATA_DALRONN));
if (dalronn && dalronn->isDead())
CAST_CRE(dalronn)->Respawn();
- pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED);
+ instance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED);
}
}
void EnterCombat(Unit* who)
{
- if (!ghost && pInstance)
+ if (!ghost && instance)
{
DoScriptText(YELL_SKARVALD_AGGRO, me);
- Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN));
+ Unit* dalronn = Unit::GetUnit((*me), instance->GetData64(DATA_DALRONN));
if (dalronn && dalronn->isAlive() && !dalronn->getVictim())
dalronn->getThreatManager().addThreat(who, 0.0f);
- pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS);
+ instance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS);
}
}
void JustDied(Unit* Killer)
{
- if (!ghost && pInstance)
+ if (!ghost && instance)
{
- Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN));
+ Unit* dalronn = Unit::GetUnit((*me), instance->GetData64(DATA_DALRONN));
if (dalronn)
{
if (dalronn->isDead())
{
DoScriptText(YELL_SKARVALD_DAL_DIED, me);
- pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE);
+ instance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE);
}
else
{
@@ -157,7 +157,7 @@ public:
{
if (ghost)
{
- if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
+ if (instance && instance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
}
@@ -171,7 +171,7 @@ public:
if (Check_Timer <= diff)
{
Check_Timer = 5000;
- Unit* dalronn = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_DALRONN) : 0);
+ Unit* dalronn = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_DALRONN) : 0);
if (dalronn && dalronn->isDead())
{
Dalronn_isDead = true;
@@ -223,10 +223,10 @@ public:
{
boss_dalronn_the_controllerAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool ghost;
uint32 ShadowBolt_Timer;
@@ -248,44 +248,44 @@ public:
AggroYell_Timer = 0;
ghost = me->GetEntry() == MOB_DALRONN_GHOST;
- if (!ghost && pInstance)
+ if (!ghost && instance)
{
- Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD));
+ Unit* skarvald = Unit::GetUnit((*me), instance->GetData64(DATA_SKARVALD));
if (skarvald && skarvald->isDead())
CAST_CRE(skarvald)->Respawn();
- pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED);
+ instance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED);
}
}
void EnterCombat(Unit* who)
{
- if (!ghost && pInstance)
+ if (!ghost && instance)
{
- Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD));
+ Unit* skarvald = Unit::GetUnit((*me), instance->GetData64(DATA_SKARVALD));
if (skarvald && skarvald->isAlive() && !skarvald->getVictim())
skarvald->getThreatManager().addThreat(who, 0.0f);
AggroYell_Timer = 5000;
- if (pInstance)
- pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS);
}
}
void JustDied(Unit* Killer)
{
- if (!ghost && pInstance)
+ if (!ghost && instance)
{
- Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD));
+ Unit* skarvald = Unit::GetUnit((*me), instance->GetData64(DATA_SKARVALD));
if (skarvald)
{
if (skarvald->isDead())
{
DoScriptText(YELL_DALRONN_SKA_DIED, me);
- if (pInstance)
- pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE);
}
else
{
@@ -316,7 +316,7 @@ public:
{
if (ghost)
{
- if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
+ if (instance && instance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
}
@@ -340,7 +340,7 @@ public:
if (Check_Timer <= diff)
{
Check_Timer = 5000;
- Unit* skarvald = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_SKARVALD) : 0);
+ Unit* skarvald = Unit::GetUnit(*me, instance ? instance->GetData64(DATA_SKARVALD) : 0);
if (skarvald && skarvald->isDead())
{
Skarvald_isDead = true;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index 89bad9e7068..488c38f5a6e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -53,14 +53,14 @@ class instance_utgarde_keep : public InstanceMapScript
public:
instance_utgarde_keep() : InstanceMapScript("instance_utgarde_keep", 574) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_utgarde_keep_InstanceMapScript(pMap);
+ return new instance_utgarde_keep_InstanceMapScript(map);
}
struct instance_utgarde_keep_InstanceMapScript : public InstanceScript
{
- instance_utgarde_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_utgarde_keep_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 Keleseth;
uint64 Skarvald;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index 34041445266..45ceb85a640 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -39,11 +39,11 @@ public:
{
npc_dragonflayer_forge_masterAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
fm_Type = 0;
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 fm_Type;
void Reset()
@@ -54,18 +54,18 @@ public:
void CheckForge()
{
- if (pInstance)
+ if (instance)
{
switch (fm_Type)
{
case 1:
- pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE);
+ instance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE);
break;
case 2:
- pInstance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE);
+ instance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE);
break;
case 3:
- pInstance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE);
+ instance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE);
break;
}
}
@@ -74,18 +74,18 @@ public:
void JustDied(Unit* /*killer*/)
{
if (fm_Type == 0) fm_Type = GetForgeMasterType();
- if (pInstance)
+ if (instance)
{
switch (fm_Type)
{
case 1:
- pInstance->SetData(EVENT_FORGE_1, DONE);
+ instance->SetData(EVENT_FORGE_1, DONE);
break;
case 2:
- pInstance->SetData(EVENT_FORGE_2, DONE);
+ instance->SetData(EVENT_FORGE_2, DONE);
break;
case 3:
- pInstance->SetData(EVENT_FORGE_3, DONE);
+ instance->SetData(EVENT_FORGE_3, DONE);
break;
}
}
@@ -94,18 +94,18 @@ public:
void EnterCombat(Unit* /*who*/)
{
if (fm_Type == 0) fm_Type = GetForgeMasterType();
- if (pInstance)
+ if (instance)
{
switch (fm_Type)
{
case 1:
- pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS);
+ instance->SetData(EVENT_FORGE_1, IN_PROGRESS);
break;
case 2:
- pInstance->SetData(EVENT_FORGE_2, IN_PROGRESS);
+ instance->SetData(EVENT_FORGE_2, IN_PROGRESS);
break;
case 3:
- pInstance->SetData(EVENT_FORGE_3, IN_PROGRESS);
+ instance->SetData(EVENT_FORGE_3, IN_PROGRESS);
break;
}
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index e0164f46bd8..9fa9c7c9d4f 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -96,7 +96,7 @@ public:
{
boss_palehoofAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiArcingSmashTimer;
@@ -107,7 +107,7 @@ public:
uint8 AddCount;
bool DoneAdds[4];
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -123,31 +123,31 @@ public:
currentPhase = PHASE_NONE;
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED);
+ instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED);
- Creature* pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN));
- if (pTemp && !pTemp->isAlive())
- pTemp->Respawn();
+ Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FRENZIED_WORGEN));
+ if (temp && !temp->isAlive())
+ temp->Respawn();
- pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO));
- if (pTemp && !pTemp->isAlive())
- pTemp->Respawn();
+ temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FEROCIOUS_RHINO));
+ if (temp && !temp->isAlive())
+ temp->Respawn();
- pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR));
- if (pTemp && !pTemp->isAlive())
- pTemp->Respawn();
+ temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR));
+ if (temp && !temp->isAlive())
+ temp->Respawn();
- pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG));
- if (pTemp && !pTemp->isAlive())
- pTemp->Respawn();
+ temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG));
+ if (temp && !temp->isAlive())
+ temp->Respawn();
- GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE));
- if (pGo)
+ GameObject* go = instance->instance->GetGameObject(instance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE));
+ if (go)
{
- pGo->SetGoState(GO_STATE_READY);
- pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
+ go->SetGoState(GO_STATE_READY);
+ go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
}
}
}
@@ -183,9 +183,9 @@ public:
if (!UpdateVictim())
return;
- Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0);
- if (pTemp && pTemp->isAlive())
- pTemp->DisappearAndDie();
+ Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
+ if (temp && temp->isAlive())
+ temp->DisappearAndDie();
if (uiArcingSmashTimer <= diff)
{
@@ -212,11 +212,11 @@ public:
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE);
- Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0);
- if (pTemp && pTemp->isAlive())
- pTemp->DisappearAndDie();
+ if (instance)
+ instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE);
+ Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
+ if (temp && temp->isAlive())
+ temp->DisappearAndDie();
}
void KilledUnit(Unit* /*victim*/)
@@ -228,7 +228,7 @@ public:
{
if (currentPhase == PHASE_NONE)
{
- pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS);
+ instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS);
me->SummonCreature(MOB_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN);
}
Phase move = PHASE_NONE;
@@ -256,7 +256,7 @@ public:
move = (Phase)(move % 4);
}
//send orb to summon spot
- Creature* pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0);
+ Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
if (pOrb && pOrb->isAlive())
{
if (currentPhase == PHASE_NONE)
@@ -299,14 +299,14 @@ public:
{
mob_ravenous_furbolgAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiChainLightingTimer;
uint32 uiCrazedTimer;
uint32 uiTerrifyingRoarTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -316,10 +316,10 @@ public:
me->GetMotionMaster()->MoveTargetedHome();
- if (pInstance)
- if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
+ if (instance)
+ if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof && pPalehoof->isAlive())
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset();
}
@@ -371,9 +371,9 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof)
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase();
}
@@ -412,14 +412,14 @@ public:
{
mob_frenzied_worgenAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiMortalWoundTimer;
uint32 uiEnrage1Timer;
uint32 uiEnrage2Timer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -429,10 +429,10 @@ public:
me->GetMotionMaster()->MoveTargetedHome();
- if (pInstance)
- if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
+ if (instance)
+ if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof && pPalehoof->isAlive())
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset();
}
@@ -480,15 +480,15 @@ public:
who->SetInCombatWith(me);
DoStartMovement(who);
}
- if (pInstance)
- pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS);
}
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF));
+ Creature* pPalehoof = Unit::GetCreature((*me), instance->GetData64(DATA_GORTOK_PALEHOOF));
if (pPalehoof)
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase();
}
@@ -528,14 +528,14 @@ public:
{
mob_ferocious_rhinoAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiStompTimer;
uint32 uiGoreTimer;
uint32 uiGrievousWoundTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -545,10 +545,10 @@ public:
me->GetMotionMaster()->MoveTargetedHome();
- if (pInstance)
- if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
+ if (instance)
+ if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof && pPalehoof->isAlive())
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset();
}
@@ -601,9 +601,9 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof)
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase();
}
@@ -648,14 +648,14 @@ public:
{
mob_massive_jormungarAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiAcidSpitTimer;
uint32 uiAcidSplatterTimer;
uint32 uiPoisonBreathTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -665,10 +665,10 @@ public:
me->GetMotionMaster()->MoveTargetedHome();
- if (pInstance)
- if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
+ if (instance)
+ if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof && pPalehoof->isAlive())
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset();
}
@@ -722,9 +722,9 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- Creature* pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof)
CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase();
}
@@ -754,10 +754,10 @@ public:
{
mob_palehoof_orbAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 SummonTimer;
Phase currentPhase;
@@ -782,11 +782,11 @@ public:
Creature* pNext = NULL;
switch (currentPhase)
{
- case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break;
- case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break;
- case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
- case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
- case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
+ case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break;
+ case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break;
+ case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
+ case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
+ case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
default: break;
}
@@ -813,11 +813,11 @@ public:
Creature* pNext = NULL;
switch (id)
{
- case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break;
- case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break;
- case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
- case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
- case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
+ case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break;
+ case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break;
+ case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
+ case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
+ case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
default: break;
}
if (pNext)
@@ -836,9 +836,9 @@ public:
bool OnGossipHello(Player* /*player*/, GameObject* pGO)
{
- InstanceScript* pInstance = pGO->GetInstanceScript();
+ InstanceScript* instance = pGO->GetInstanceScript();
- Creature* pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
+ Creature* pPalehoof = Unit::GetCreature(*pGO, instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0);
if (pPalehoof && pPalehoof->isAlive())
{
pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 1de46ca9de3..7b459e7410d 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -170,10 +170,10 @@ public:
{
boss_skadiAI(Creature* c) : ScriptedAI(c), Summons(me)
{
- m_pInstance = c->GetInstanceScript();
+ m_instance = c->GetInstanceScript();
}
- InstanceScript* m_pInstance;
+ InstanceScript* m_instance;
SummonList Summons;
uint64 m_uiGraufGUID;
std::vector<uint64> triggersGUID;
@@ -208,10 +208,10 @@ public:
me->SetSpeed(MOVE_FLIGHT, 3.0f);
if ((Unit::GetCreature((*me), m_uiGraufGUID) == NULL) && !me->IsMounted())
me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f);
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED);
- m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
+ m_instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED);
+ m_instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
}
@@ -235,10 +235,10 @@ public:
m_uiMovementTimer = 1000;
m_uiSummonTimer = 10000;
me->SetInCombatWithZone();
- if (m_pInstance)
+ if (m_instance)
{
- m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS);
- m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
+ m_instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS);
+ m_instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
m_uiMountTimer = 1000;
@@ -411,8 +411,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
Summons.DespawnAll();
- if (m_pInstance)
- m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE);
+ if (m_instance)
+ m_instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -463,10 +463,10 @@ public:
bool OnGossipHello(Player* player, GameObject* pGO)
{
- InstanceScript* m_pInstance = pGO->GetInstanceScript();
- if (!m_pInstance) return false;
+ InstanceScript* m_instance = pGO->GetInstanceScript();
+ if (!m_instance) return false;
- if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS)))
+ if (Creature* pSkadi = Unit::GetCreature((*pGO), m_instance->GetData64(DATA_SKADI_THE_RUTHLESS)))
{
player->CastSpell(pSkadi, SPELL_RAPID_FIRE, true);
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index ab6eae9a241..1b70de6244e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -98,7 +98,7 @@ public:
{
boss_svalaAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiIntroTimer;
@@ -110,7 +110,7 @@ public:
TempSummon* pArthas;
uint64 uiArthasGUID;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -119,8 +119,8 @@ public:
uiIntroPhase = 0;
uiArthasGUID = 0;
- if (pInstance)
- pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED);
}
void MoveInLineOfSight(Unit* who)
@@ -221,10 +221,10 @@ public:
{
mob_ritual_channelerAI(Creature* c) :Scripted_NoMovementAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -234,8 +234,8 @@ public:
// called by svala sorrowgrave to set guid of victim
void DoAction(const int32 /*action*/)
{
- if (pInstance)
- if (Unit* victim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER)))
+ if (instance)
+ if (Unit* victim = me->GetUnit(*me, instance->GetData64(DATA_SACRIFICED_PLAYER)))
DoCast(victim, SPELL_PARALYZE);
}
@@ -260,7 +260,7 @@ public:
{
boss_svala_sorrowgraveAI(Creature* c) : ScriptedAI(c), summons(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiSinsterStrikeTimer;
@@ -274,7 +274,7 @@ public:
bool bSacrificed;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -292,10 +292,10 @@ public:
summons.DespawnAll();
- if (pInstance)
+ if (instance)
{
- pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED);
- pInstance->SetData64(DATA_SACRIFICED_PLAYER, 0);
+ instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED);
+ instance->SetData64(DATA_SACRIFICED_PLAYER, 0);
}
}
@@ -303,8 +303,8 @@ public:
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS);
}
void JustSummoned(Creature* summon)
@@ -353,9 +353,9 @@ public:
me->SetUnitMovementFlags(MOVEMENTFLAG_CAN_FLY);
DoTeleportTo(296.632f, -346.075f, 120.85f);
Phase = SACRIFICING;
- if (pInstance)
+ if (instance)
{
- pInstance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID());
+ instance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID());
for (uint8 i = 0; i < 3; ++i)
if (Creature* summon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000))
@@ -373,8 +373,8 @@ public:
{
if (uiSacrificeTimer <= diff)
{
- Unit* pSacrificeTarget = pInstance ? Unit::GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER)) : NULL;
- if (pInstance && !summons.empty() && pSacrificeTarget && pSacrificeTarget->isAlive())
+ Unit* pSacrificeTarget = instance ? Unit::GetUnit(*me, instance->GetData64(DATA_SACRIFICED_PLAYER)) : NULL;
+ if (instance && !summons.empty() && pSacrificeTarget && pSacrificeTarget->isAlive())
me->Kill(pSacrificeTarget, false); // durability damage?
//go down
@@ -397,13 +397,13 @@ public:
void JustDied(Unit* killer)
{
- if (pInstance)
+ if (instance)
{
- Creature* pSvala = Unit::GetCreature((*me), pInstance->GetData64(DATA_SVALA));
+ Creature* pSvala = Unit::GetCreature((*me), instance->GetData64(DATA_SVALA));
if (pSvala && pSvala->isAlive())
killer->Kill(pSvala);
- pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE);
+ instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE);
}
DoScriptText(SAY_DEATH, me);
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 4bfd2d53761..911be1815b3 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -110,7 +110,7 @@ public:
{
boss_ymironAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
for (int i = 0; i < 4; ++i)
m_uiActiveOrder[i] = i;
for (int i = 0; i < 3; ++i)
@@ -150,7 +150,7 @@ public:
uint64 m_uiActivedCreatureGUID;
uint64 m_uiOrbGUID;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -179,16 +179,16 @@ public:
DespawnBoatGhosts(m_uiActivedCreatureGUID);
DespawnBoatGhosts(m_uiOrbGUID);
- if (pInstance)
- pInstance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS);
}
void SpellHitTarget(Unit* who, SpellInfo const* spell)
@@ -213,12 +213,12 @@ public:
{
DoScriptText(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].say, me);
DoCast(me, SPELL_CHANNEL_YMIRON_TO_SPIRIT); // should be on spirit
- if (Creature* pTemp = me->SummonCreature(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+ if (Creature* temp = me->SummonCreature(ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBoat[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0))
{
- m_uiActivedCreatureGUID = pTemp->GetGUID();
- pTemp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true);
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
- pTemp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ m_uiActivedCreatureGUID = temp->GetGUID();
+ temp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true);
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+ temp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
switch (m_uiActiveOrder[m_uiActivedNumber])
{
case 0: m_bIsActiveWithBJORN = true; break;
@@ -284,13 +284,13 @@ public:
if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff)
{
//DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control
- if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000))
+ if (Creature* temp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000))
{
- pTemp->SetSpeed(MOVE_RUN, 0.4f);
- pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true);
- pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
- pTemp->SetDisplayId(11686);
- m_uiOrbGUID = pTemp->GetGUID();
+ temp->SetSpeed(MOVE_RUN, 0.4f);
+ temp->CastSpell(temp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true);
+ temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+ temp->SetDisplayId(11686);
+ m_uiOrbGUID = temp->GetGUID();
}
m_bIsActiveWithBJORN = false; // only one orb
} else m_uiAbility_BJORN_Timer -= diff;
@@ -316,12 +316,12 @@ public:
for (uint8 i = 0; i < 4; ++i)
{
//DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control
- if (Creature* pTemp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
+ if (Creature* temp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
- pTemp->AddThreat(target, 0.0f);
- pTemp->AI()->AttackStart(target);
+ temp->AddThreat(target, 0.0f);
+ temp->AI()->AttackStart(target);
}
}
}
@@ -370,8 +370,8 @@ public:
DespawnBoatGhosts(m_uiActivedCreatureGUID);
DespawnBoatGhosts(m_uiOrbGUID);
- if (pInstance)
- pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_KING_YMIRON_EVENT, DONE);
}
void KilledUnit(Unit* /*victim*/)
@@ -382,8 +382,8 @@ public:
void DespawnBoatGhosts(uint64 m_uiCreatureGUID)
{
if (m_uiCreatureGUID)
- if (Creature* pTemp = Unit::GetCreature(*me, m_uiCreatureGUID))
- pTemp->DisappearAndDie();
+ if (Creature* temp = Unit::GetCreature(*me, m_uiCreatureGUID))
+ temp->DisappearAndDie();
m_uiCreatureGUID = 0;
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
index 5cc68e20f9f..5dbd431fe21 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
@@ -39,14 +39,14 @@ class instance_utgarde_pinnacle : public InstanceMapScript
public:
instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_pinnacle(pMap);
+ return new instance_pinnacle(map);
}
struct instance_pinnacle : public InstanceScript
{
- instance_pinnacle(Map* pMap) : InstanceScript(pMap) {}
+ instance_pinnacle(Map* map) : InstanceScript(map) {}
uint64 uiSvalaSorrowgrave;
uint64 uiGortokPalehoof;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 7ba12847750..25233eb92ef 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -59,7 +59,7 @@ public:
{
boss_cyanigosaAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiArcaneVacuumTimer;
@@ -68,7 +68,7 @@ public:
uint32 uiTailSweepTimer;
uint32 uiUncontrollableEnergyTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -77,26 +77,26 @@ public:
uiManaDestructionTimer = 30000;
uiTailSweepTimer = 20000;
uiUncontrollableEnergyTimer = 25000;
- if (pInstance)
- pInstance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED);
+ if (instance)
+ instance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
- pInstance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS);
}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
{
- if (pInstance && pInstance->GetData(DATA_REMOVE_NPC) == 1)
+ if (instance && instance->GetData(DATA_REMOVE_NPC) == 1)
{
me->DespawnOrUnsummon();
- pInstance->SetData(DATA_REMOVE_NPC, 0);
+ instance->SetData(DATA_REMOVE_NPC, 0);
}
//Return since we have no target
@@ -145,8 +145,8 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
- pInstance->SetData(DATA_CYANIGOSA_EVENT, DONE);
+ if (instance)
+ instance->SetData(DATA_CYANIGOSA_EVENT, DONE);
}
void KilledUnit(Unit* victim)
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index 5e816cc1488..584e5b8979a 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -57,7 +57,7 @@ public:
{
boss_erekemAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiBloodlustTimer;
@@ -66,7 +66,7 @@ public:
uint32 uiLightningBoltTimer;
uint32 uiEarthShieldTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -75,20 +75,20 @@ public:
uiEarthShockTimer = urand(2000, 8000);
uiLightningBoltTimer = urand(5000, 10000);
uiEarthShieldTimer = 20000;
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
}
- if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0))
+ if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0))
{
if (!pGuard1->isAlive())
pGuard1->Respawn();
}
- if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0))
+ if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0))
{
if (!pGuard2->isAlive())
pGuard2->Respawn();
@@ -107,13 +107,13 @@ public:
who->SetInCombatWith(me);
DoStartMovement(who);
- if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0))
+ if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0))
{
pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
if (!pGuard1->getVictim() && pGuard1->AI())
pGuard1->AI()->AttackStart(who);
}
- if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0))
+ if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0))
{
pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
if (!pGuard2->getVictim() && pGuard2->AI())
@@ -127,19 +127,19 @@ public:
DoScriptText(SAY_AGGRO, me);
DoCast(me, SPELL_EARTH_SHIELD);
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_EREKEM_CELL)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_EREKEM_CELL)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
}
}
@@ -154,9 +154,9 @@ public:
//spam stormstrike in hc mode if spawns are dead
if (IsHeroic())
{
- if (Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0))
+ if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0))
{
- if (Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0))
+ if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0))
{
if (!pGuard1->isAlive() && !pGuard2->isAlive())
DoCast(me->getVictim(), SPELL_STORMSTRIKE);
@@ -178,8 +178,8 @@ public:
DoCast(target, SPELL_CHAIN_HEAL);
//If one of the adds is dead spawn heals faster
- Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0);
- Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0);
+ Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0);
+ Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0);
uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000;
}
} else uiChainHealTimer -= diff;
@@ -210,17 +210,17 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
{
- pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 7);
+ instance->SetData(DATA_1ST_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 7);
}
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
{
- pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 13);
+ instance->SetData(DATA_2ND_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 13);
}
}
}
@@ -237,11 +237,11 @@ public:
if (HealthBelowPct(85))
return me->GetGUID();
- Creature* pGuard1 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_1) : 0);
+ Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0);
if (pGuard1 && pGuard1->isAlive() && !pGuard1->HealthAbovePct(75))
return pGuard1->GetGUID();
- Creature* pGuard2 = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_EREKEM_GUARD_2) : 0);
+ Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0);
if (pGuard2 && pGuard2->isAlive() && !pGuard2->HealthAbovePct(75))
return pGuard2->GetGUID();
@@ -272,14 +272,14 @@ public:
{
mob_erekem_guardAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiGushingWoundTimer;
uint32 uiHowlingScreechTimer;
uint32 uiStrikeTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index 1bf13ffd5ce..622fc2355fa 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -83,7 +83,7 @@ public:
{
boss_ichoronAI(Creature* creature) : ScriptedAI(creature), m_waterElements(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
bool bIsExploded;
@@ -93,7 +93,7 @@ public:
uint32 uiBubbleCheckerTimer;
uint32 uiWaterBoltVolleyTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
SummonList m_waterElements;
@@ -108,12 +108,12 @@ public:
me->SetVisible(true);
DespawnWaterElements();
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
}
}
@@ -123,18 +123,18 @@ public:
DoCast(me, SPELL_PROTECTIVE_BUBBLE);
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ICHORON_CELL)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_ICHORON_CELL)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
}
}
@@ -245,8 +245,8 @@ public:
if (!m_waterElements.empty())
{
for (std::list<uint64>::const_iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr)
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
- if (pTemp->isAlive())
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
+ if (temp->isAlive())
{
bIsWaterElementsAlive = true;
break;
@@ -286,17 +286,17 @@ public:
DespawnWaterElements();
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
{
- pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 7);
+ instance->SetData(DATA_1ST_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 7);
}
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
{
- pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 13);
+ instance->SetData(DATA_2ND_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 13);
}
}
}
@@ -308,7 +308,7 @@ public:
summoned->SetSpeed(MOVE_RUN, 0.3f);
summoned->GetMotionMaster()->MoveFollow(me, 0, 0);
m_waterElements.push_back(summoned->GetGUID());
- pInstance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID());
+ instance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID());
}
}
@@ -317,7 +317,7 @@ public:
if (summoned)
{
m_waterElements.remove(summoned->GetGUID());
- pInstance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID());
+ instance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID());
}
}
@@ -345,10 +345,10 @@ public:
{
mob_ichor_globuleAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiRangeCheck_Timer;
@@ -367,9 +367,9 @@ public:
{
if (uiRangeCheck_Timer < uiDiff)
{
- if (pInstance)
+ if (instance)
{
- if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON)))
+ if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON)))
{
if (me->IsWithinDist(pIchoron, 2.0f, false))
{
@@ -387,7 +387,7 @@ public:
void JustDied(Unit* /*killer*/)
{
DoCast(me, SPELL_SPLASH);
- if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON)))
+ if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON)))
if (pIchoron->AI())
pIchoron->AI()->DoAction(ACTION_WATER_ELEMENT_KILLED);
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
index 5f8318644d5..648c4a71762 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
@@ -43,7 +43,7 @@ public:
{
boss_lavanthorAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiFireboltTimer;
@@ -51,7 +51,7 @@ public:
uint32 uiLavaBurnTimer;
uint32 uiCauterizingFlamesTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -59,29 +59,29 @@ public:
uiFlameBreathTimer = 5000;
uiLavaBurnTimer = 10000;
uiCauterizingFlamesTimer = 3000;
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
}
}
void EnterCombat(Unit* /*who*/)
{
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_LAVANTHOR_CELL)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_LAVANTHOR_CELL)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
}
}
@@ -139,17 +139,17 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
{
- pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 7);
+ instance->SetData(DATA_1ST_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 7);
}
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
{
- pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 13);
+ instance->SetData(DATA_2ND_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 13);
}
}
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index 3ebd7f771de..42ce12ec903 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -39,42 +39,42 @@ public:
{
boss_moraggAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiOpticLinkTimer;
uint32 uiCorrosiveSalivaTimer;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
uiOpticLinkTimer = 10000;
uiCorrosiveSalivaTimer = 5000;
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
}
}
void EnterCombat(Unit* /*who*/)
{
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MORAGG_CELL)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_MORAGG_CELL)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
}
}
@@ -117,17 +117,17 @@ public:
}
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
{
- pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 7);
+ instance->SetData(DATA_1ST_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 7);
}
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
{
- pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 13);
+ instance->SetData(DATA_2ND_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 13);
}
}
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index a49462813f2..d61b81e6ba7 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -71,10 +71,10 @@ public:
{
boss_xevozzAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiSummonEtherealSphere_Timer;
uint32 uiArcaneBarrageVolley_Timer;
@@ -82,12 +82,12 @@ public:
void Reset()
{
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
}
uiSummonEtherealSphere_Timer = urand(10000, 12000);
@@ -138,18 +138,18 @@ public:
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_XEVOZZ_CELL)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_XEVOZZ_CELL)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
}
}
@@ -199,17 +199,17 @@ public:
DespawnSphere();
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
{
- pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 7);
+ instance->SetData(DATA_1ST_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 7);
}
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
{
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
- pInstance->SetData(DATA_WAVE_COUNT, 13);
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ instance->SetData(DATA_WAVE_COUNT, 13);
}
}
}
@@ -238,10 +238,10 @@ public:
{
mob_ethereal_sphereAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 uiSummonPlayers_Timer;
uint32 uiRangeCheck_Timer;
@@ -263,9 +263,9 @@ public:
if (uiRangeCheck_Timer < uiDiff)
{
- if (pInstance)
+ if (instance)
{
- if (Creature* pXevozz = Unit::GetCreature(*me, pInstance->GetData64(DATA_XEVOZZ)))
+ if (Creature* pXevozz = Unit::GetCreature(*me, instance->GetData64(DATA_XEVOZZ)))
{
float fDistance = me->GetDistance2d(pXevozz);
if (fDistance <= 3)
@@ -282,10 +282,10 @@ public:
{
DoCast(me, SPELL_SUMMON_PLAYERS); // not working right
- Map* pMap = me->GetMap();
- if (pMap && pMap->IsDungeon())
+ Map* map = me->GetMap();
+ if (map && map->IsDungeon())
{
- Map::PlayerList const &PlayerList = pMap->GetPlayers();
+ Map::PlayerList const &PlayerList = map->GetPlayers();
if (!PlayerList.isEmpty())
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index b02ea4bfc48..d0f29422912 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -63,10 +63,10 @@ public:
{
boss_zuramatAI(Creature* c) : ScriptedAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint32 SpellVoidShiftTimer;
uint32 SpellSummonVoidTimer;
@@ -75,12 +75,12 @@ public:
void Reset()
{
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, NOT_STARTED);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED);
}
SpellShroudOfDarknessTimer = 22000;
@@ -106,18 +106,18 @@ public:
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
- if (pInstance)
+ if (instance)
{
- if (GameObject* pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ZURAMAT_CELL)))
+ if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_ZURAMAT_CELL)))
if (pDoor->GetGoState() == GO_STATE_READY)
{
EnterEvadeMode();
return;
}
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
- pInstance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
- pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
+ instance->SetData(DATA_1ST_BOSS_EVENT, IN_PROGRESS);
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
+ instance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS);
}
}
@@ -169,17 +169,17 @@ public:
{
DoScriptText(SAY_DEATH, me);
- if (pInstance)
+ if (instance)
{
- if (pInstance->GetData(DATA_WAVE_COUNT) == 6)
+ if (instance->GetData(DATA_WAVE_COUNT) == 6)
{
- pInstance->SetData(DATA_1ST_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 7);
+ instance->SetData(DATA_1ST_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 7);
}
- else if (pInstance->GetData(DATA_WAVE_COUNT) == 12)
+ else if (instance->GetData(DATA_WAVE_COUNT) == 12)
{
- pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE);
- pInstance->SetData(DATA_WAVE_COUNT, 13);
+ instance->SetData(DATA_2ND_BOSS_EVENT, DONE);
+ instance->SetData(DATA_WAVE_COUNT, 13);
}
}
}
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index ad295ec1a9a..4df44f1c851 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -105,14 +105,14 @@ class instance_violet_hold : public InstanceMapScript
public:
instance_violet_hold() : InstanceMapScript("instance_violet_hold", 608) { }
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* map) const
{
- return new instance_violet_hold_InstanceMapScript(pMap);
+ return new instance_violet_hold_InstanceMapScript(map);
}
struct instance_violet_hold_InstanceMapScript : public InstanceScript
{
- instance_violet_hold_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
+ instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 uiMoragg;
uint64 uiErekem;
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 3270941ba3e..801ab408685 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -261,8 +261,8 @@ public:
case GOSSIP_ACTION_INFO_DEF+1:
player->CLOSE_GOSSIP_MENU();
CAST_AI(npc_sinclari_vh::npc_sinclariAI, (creature->AI()))->uiPhase = 1;
- if (InstanceScript* pInstance = creature->GetInstanceScript())
- pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL);
+ if (InstanceScript* instance = creature->GetInstanceScript())
+ instance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL);
break;
case GOSSIP_ACTION_INFO_DEF+2:
player->SEND_GOSSIP_MENU(13854, creature->GetGUID());
@@ -277,9 +277,9 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (InstanceScript* pInstance = creature->GetInstanceScript())
+ if (InstanceScript* instance = creature->GetInstanceScript())
{
- switch (pInstance->GetData(DATA_MAIN_EVENT_PHASE))
+ switch (instance->GetData(DATA_MAIN_EVENT_PHASE))
{
case NOT_STARTED:
case FAIL: // Allow to start event if not started or wiped
@@ -307,10 +307,10 @@ public:
{
npc_sinclariAI(Creature* creature) : ScriptedAI(creature)
{
- pInstance = creature->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
uint8 uiPhase;
uint32 uiTimer;
@@ -394,8 +394,8 @@ public:
uiPhase = 5;
break;
case 5:
- if (pInstance)
- pInstance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS);
+ if (instance)
+ instance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS);
me->SetReactState(REACT_PASSIVE);
uiTimer = 0;
uiPhase = 0;
@@ -428,20 +428,20 @@ public:
{
mob_azure_saboteurAI(Creature* c):npc_escortAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
bHasGotMovingPoints = false;
uiBoss = 0;
Reset();
}
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bHasGotMovingPoints;
uint32 uiBoss;
void Reset()
{
- if (pInstance && !uiBoss)
- uiBoss = pInstance->GetData(DATA_WAVE_COUNT) == 6 ? pInstance->GetData(DATA_FIRST_BOSS) : pInstance->GetData(DATA_SECOND_BOSS);
+ if (instance && !uiBoss)
+ uiBoss = instance->GetData(DATA_WAVE_COUNT) == 6 ? instance->GetData(DATA_FIRST_BOSS) : instance->GetData(DATA_SECOND_BOSS);
me->SetReactState(REACT_PASSIVE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -480,7 +480,7 @@ public:
void UpdateAI(const uint32 diff)
{
- if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS)
+ if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS)
me->CastStop();
npc_escortAI::UpdateAI(diff);
@@ -529,10 +529,10 @@ public:
{
me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false);
me->DisappearAndDie();
- Creature* pSaboPort = Unit::GetCreature((*me), pInstance->GetData64(DATA_SABOTEUR_PORTAL));
+ Creature* pSaboPort = Unit::GetCreature((*me), instance->GetData64(DATA_SABOTEUR_PORTAL));
if (pSaboPort)
pSaboPort->DisappearAndDie();
- pInstance->SetData(DATA_START_BOSS_ENCOUNTER, 1);
+ instance->SetData(DATA_START_BOSS_ENCOUNTER, 1);
}
};
@@ -552,7 +552,7 @@ public:
{
npc_teleportation_portalAI(Creature* c) : ScriptedAI(c), listOfMobs(me)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs
bPortalGuardianOrKeeperOrEliteSpawn = false;
}
@@ -563,7 +563,7 @@ public:
SummonList listOfMobs;
- InstanceScript* pInstance;
+ InstanceScript* instance;
void Reset()
{
@@ -577,16 +577,16 @@ public:
void UpdateAI(const uint32 diff)
{
- if (!pInstance) //Massive usage of pInstance, global check
+ if (!instance) //Massive usage of instance, global check
return;
- if (pInstance->GetData(DATA_REMOVE_NPC) == 1)
+ if (instance->GetData(DATA_REMOVE_NPC) == 1)
{
me->DespawnOrUnsummon();
- pInstance->SetData(DATA_REMOVE_NPC, 0);
+ instance->SetData(DATA_REMOVE_NPC, 0);
}
- uint8 uiWaveCount = pInstance->GetData(DATA_WAVE_COUNT);
+ uint8 uiWaveCount = instance->GetData(DATA_WAVE_COUNT);
if ((uiWaveCount == 6) || (uiWaveCount == 12)) //Don't spawn mobs on boss encounters
return;
@@ -624,7 +624,7 @@ public:
{
if (bPortalGuardianOrKeeperOrEliteSpawn)
{
- uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4;
+ uint8 k = instance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4;
for (uint8 i = 0; i < k; ++i)
{
uint32 entry = RAND(CREATURE_AZURE_INVADER_1, CREATURE_AZURE_INVADER_2, CREATURE_AZURE_SPELLBREAKER_1, CREATURE_AZURE_SPELLBREAKER_2, CREATURE_AZURE_MAGE_SLAYER_1, CREATURE_AZURE_MAGE_SLAYER_2, CREATURE_AZURE_BINDER_1, CREATURE_AZURE_BINDER_2);
@@ -652,22 +652,22 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (pInstance)
- pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1);
+ if (instance)
+ instance->SetData(DATA_WAVE_COUNT, instance->GetData(DATA_WAVE_COUNT)+1);
}
void JustSummoned(Creature* summoned)
{
listOfMobs.Summon(summoned);
if (summoned)
- pInstance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID());
+ instance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID());
}
void SummonedMobDied(Creature* summoned)
{
listOfMobs.Despawn(summoned);
if (summoned)
- pInstance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID());
+ instance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID());
}
};
@@ -677,15 +677,15 @@ struct violet_hold_trashAI : public npc_escortAI
{
violet_hold_trashAI(Creature* c):npc_escortAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
bHasGotMovingPoints = false;
- if (pInstance)
- portalLocationID = pInstance->GetData(DATA_PORTAL_LOCATION);
+ if (instance)
+ portalLocationID = instance->GetData(DATA_PORTAL_LOCATION);
Reset();
}
public:
- InstanceScript* pInstance;
+ InstanceScript* instance;
bool bHasGotMovingPoints;
uint32 portalLocationID;
uint32 secondPortalRouteID;
@@ -723,7 +723,7 @@ struct violet_hold_trashAI : public npc_escortAI
void UpdateAI(const uint32)
{
- if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS)
+ if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS)
me->CastStop();
if (!bHasGotMovingPoints)
@@ -780,18 +780,18 @@ struct violet_hold_trashAI : public npc_escortAI
void JustDied(Unit* /*unit*/)
{
- if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL)))
+ if (Creature* portal = Unit::GetCreature((*me), instance->GetData64(DATA_TELEPORTATION_PORTAL)))
CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me);
- if (pInstance)
- pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1);
+ if (instance)
+ instance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1);
}
void CreatureStartAttackDoor()
{
me->SetReactState(REACT_PASSIVE);
DoCast(SPELL_DESTROY_DOOR_SEAL);
- if (pInstance)
- pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1);
+ if (instance)
+ instance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1);
}
};
@@ -810,7 +810,7 @@ public:
{
mob_azure_invaderAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiCleaveTimer;
@@ -888,7 +888,7 @@ public:
{
mob_azure_binderAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiArcaneExplosionTimer;
@@ -966,7 +966,7 @@ public:
{
mob_azure_mage_slayerAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiArcaneEmpowermentTimer;
@@ -1026,7 +1026,7 @@ public:
{
mob_azure_raiderAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiConcussionBlowTimer;
@@ -1078,7 +1078,7 @@ public:
{
mob_azure_stalkerAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiBackstabTimer;
uint32 uiTacticalBlinkTimer;
@@ -1137,7 +1137,7 @@ public:
{
mob_azure_spellbreakerAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiArcaneBlastTimer;
@@ -1221,7 +1221,7 @@ public:
{
mob_azure_captainAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiMortalStrikeTimer;
@@ -1273,7 +1273,7 @@ public:
{
mob_azure_sorcerorAI(Creature* c) : violet_hold_trashAI(c)
{
- pInstance = c->GetInstanceScript();
+ instance = c->GetInstanceScript();
}
uint32 uiArcaneStreamTimer;
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index a0d64e38d49..9c40fbb3f82 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -598,9 +598,9 @@ public:
if (TempSummon* summon = me->ToTempSummon())
if (summon->isSummon())
- if (Unit* pTemp = summon->GetSummoner())
- if (pTemp->GetTypeId() == TYPEID_PLAYER)
- CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0);
+ if (Unit* temp = summon->GetSummoner())
+ if (temp->GetTypeId() == TYPEID_PLAYER)
+ CAST_PLR(temp)->KilledMonsterCredit(me->GetEntry(), 0);
if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID))
go_caribou->SetGoState(GO_STATE_READY);
@@ -794,15 +794,15 @@ public:
return new npc_lurgglbrAI(creature);
}
- bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
+ bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
- if (pQuest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS)
+ if (quest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS)
{
- if (GameObject* pGo = creature->FindNearestGameObject(GO_CAGE, 5.0f))
+ if (GameObject* go = creature->FindNearestGameObject(GO_CAGE, 5.0f))
{
- pGo->SetRespawnTime(0);
- pGo->SetGoType(GAMEOBJECT_TYPE_BUTTON);
- pGo->UseDoorOrButton(20);
+ go->SetRespawnTime(0);
+ go->SetGoType(GAMEOBJECT_TYPE_BUTTON);
+ go->UseDoorOrButton(20);
}
if (npc_escortAI* pEscortAI = CAST_AI(npc_lurgglbr::npc_lurgglbrAI, creature->AI()))
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp
index aa391712ad1..f76ac69ab7a 100644
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/howling_fjord.cpp
@@ -348,9 +348,9 @@ class npc_daegarn : public CreatureScript
public:
npc_daegarn() : CreatureScript("npc_daegarn") { }
- bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
+ bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
- if (pQuest->GetQuestId() == QUEST_DEFEAT_AT_RING)
+ if (quest->GetQuestId() == QUEST_DEFEAT_AT_RING)
{
if (npc_daegarnAI* pDaegarnAI = CAST_AI(npc_daegarn::npc_daegarnAI, creature->AI()))
pDaegarnAI->StartEvent(player->GetGUID());
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index 5d38bcf9f16..b3f1fb1b8b0 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -433,9 +433,9 @@ public:
return new npc_engineer_heliceAI(creature);
}
- bool OnQuestAccept(Player* player, Creature* creature, const Quest* pQuest)
+ bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
{
- if (pQuest->GetQuestId() == QUEST_DISASTER)
+ if (quest->GetQuestId() == QUEST_DISASTER)
{
if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, creature->AI()))
{
diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp
index 193c699f930..5dab265617e 100644
--- a/src/server/scripts/Northrend/zuldrak.cpp
+++ b/src/server/scripts/Northrend/zuldrak.cpp
@@ -527,25 +527,25 @@ public:
}
};
- bool OnQuestAccept(Player* player, Creature* creature, Quest const* pQuest)
+ bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
- switch (pQuest->GetQuestId())
+ switch (quest->GetQuestId())
{
case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON:
- creature->AI()->SetData(1, pQuest->GetQuestId());
+ creature->AI()->SetData(1, quest->GetQuestId());
break;
case QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER:
- creature->AI()->SetData(1, pQuest->GetQuestId());
+ creature->AI()->SetData(1, quest->GetQuestId());
break;
case QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_2:
case QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1:
- creature->AI()->SetData(1, pQuest->GetQuestId());
+ creature->AI()->SetData(1, quest->GetQuestId());
break;
case QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR:
- creature->AI()->SetData(1, pQuest->GetQuestId());
+ creature->AI()->SetData(1, quest->GetQuestId());
break;
case QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND:
- creature->AI()->SetData(1, pQuest->GetQuestId());
+ creature->AI()->SetData(1, quest->GetQuestId());
break;
}
@@ -1088,10 +1088,10 @@ public:
if (!SummonList.empty())
for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
{
- pTemp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :(
- pTemp->AI()->AttackStart(unit);
+ temp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :(
+ temp->AI()->AttackStart(unit);
}
}
}
@@ -1131,13 +1131,13 @@ public:
if (!SummonList.empty())
for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr)
{
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
{
- if (pTemp->GetPositionZ() >= 287.00f)
+ if (temp->GetPositionZ() >= 287.00f)
continue;
- if (pTemp->getVictim())
- pTemp->GetMotionMaster()->MoveChase(pTemp->getVictim());
+ if (temp->getVictim())
+ temp->GetMotionMaster()->MoveChase(temp->getVictim());
}
}
@@ -1151,8 +1151,8 @@ public:
{
if (!SummonList.empty())
for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr)
- if (Creature* pTemp = Unit::GetCreature(*me, *itr))
- pTemp->DespawnOrUnsummon();
+ if (Creature* temp = Unit::GetCreature(*me, *itr))
+ temp->DespawnOrUnsummon();
if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND, killer);