josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REPO: Code-style clean-ups

Browse Source 
* 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...
This commit is contained in:
Bootz
2011-10-07 19:45:43 -05:00
parent c89b1f6989
commit 5b4c7783c2
324 changed files with 4886 additions and 4849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+12 -12
View File
@@ -50,10 +50,10 @@ class boss_broggok : public CreatureScript
{
boss_broggokAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 AcidSpray_Timer;
uint32 PoisonSpawn_Timer;
@@ -64,20 +64,20 @@ class boss_broggok : public CreatureScript
AcidSpray_Timer = 10000;
PoisonSpawn_Timer = 5000;
PoisonBolt_Timer = 7000;
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true);
instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED);
instance->HandleGameObject(instance->GetData64(DATA_DOOR4), true);
}
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
if (pInstance)
if (instance)
{
pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), false);
instance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
instance->HandleGameObject(instance->GetData64(DATA_DOOR4), false);
}
}
@@ -123,11 +123,11 @@ class boss_broggok : public CreatureScript
void JustDied(Unit* /*who*/)
{
if (pInstance)
if (instance)
{
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR5), true);
pInstance->SetData(TYPE_BROGGOK_EVENT, DONE);
instance->HandleGameObject(instance->GetData64(DATA_DOOR4), true);
instance->HandleGameObject(instance->GetData64(DATA_DOOR5), true);
instance->SetData(TYPE_BROGGOK_EVENT, DONE);
}
}
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+10 -10
View File
@@ -80,12 +80,12 @@ class boss_kelidan_the_breaker : public CreatureScript
{
boss_kelidan_the_breakerAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
for (uint8 i=0; i<5; ++i)
Channelers[i] = 0;
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ShadowVolley_Timer;
uint32 BurningNova_Timer;
@@ -105,8 +105,8 @@ class boss_kelidan_the_breaker : public CreatureScript
Firenova = false;
addYell = false;
SummonChannelers();
if (pInstance)
pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED);
if (instance)
instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* who)
@@ -115,8 +115,8 @@ class boss_kelidan_the_breaker : public CreatureScript
if (me->IsNonMeleeSpellCasted(false))
me->InterruptNonMeleeSpells(true);
DoStartMovement(who);
if (pInstance)
pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
@@ -187,12 +187,12 @@ class boss_kelidan_the_breaker : public CreatureScript
{
DoScriptText(SAY_DIE, me);
if (!pInstance)
if (!instance)
return;
pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR1), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR6), true);
instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE);
instance->HandleGameObject(instance->GetData64(DATA_DOOR1), true);
instance->HandleGameObject(instance->GetData64(DATA_DOOR6), true);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+12 -12
View File
@@ -54,10 +54,10 @@ class boss_the_maker : public CreatureScript
{
boss_the_makerAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 AcidSpray_Timer;
uint32 ExplodingBreaker_Timer;
@@ -71,22 +71,22 @@ class boss_the_maker : public CreatureScript
Domination_Timer = 120000;
Knockdown_Timer = 10000;
if (!pInstance)
if (!instance)
return;
pInstance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true);
instance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED);
instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true);
}
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
if (!pInstance)
if (!instance)
return;
pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), false);
instance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS);
instance->HandleGameObject(instance->GetData64(DATA_DOOR2), false);
}
void KilledUnit(Unit* /*victim*/)
@@ -98,12 +98,12 @@ class boss_the_maker : public CreatureScript
{
DoScriptText(SAY_DIE, me);
if (!pInstance)
if (!instance)
return;
pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true);
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR3), true);
instance->SetData(TYPE_THE_MAKER_EVENT, DONE);
instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true);
instance->HandleGameObject(instance->GetData64(DATA_DOOR3), true);
}
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ class instance_blood_furnace : public InstanceMapScript
struct instance_blood_furnace_InstanceMapScript : public InstanceScript
{
instance_blood_furnace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_blood_furnace_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint64 The_MakerGUID;
uint64 BroggokGUID;
@@ -226,9 +226,9 @@ class instance_blood_furnace : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_blood_furnace_InstanceMapScript(pMap);
return new instance_blood_furnace_InstanceMapScript(map);
}
};
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+3 -3
View File
@@ -36,7 +36,7 @@ class instance_ramparts : public InstanceMapScript
struct instance_ramparts_InstanceMapScript : public InstanceScript
{
instance_ramparts_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 m_uiChestNGUID;
@@ -90,9 +90,9 @@ class instance_ramparts : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_ramparts_InstanceMapScript(pMap);
return new instance_ramparts_InstanceMapScript(map);
}
};
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+23 -23
View File
@@ -217,14 +217,14 @@ class boss_magtheridon : public CreatureScript
{
boss_magtheridonAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
}
CubeMap Cube;
InstanceScript* pInstance;
InstanceScript* instance;
uint32 Berserk_Timer;
uint32 Quake_Timer;
@@ -259,10 +259,10 @@ class boss_magtheridon : public CreatureScript
void JustReachedHome()
{
if (pInstance)
if (instance)
{
pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED);
pInstance->SetData(DATA_COLLAPSE, false);
instance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED);
instance->SetData(DATA_COLLAPSE, false);
}
}
@@ -324,8 +324,8 @@ class boss_magtheridon : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE);
if (instance)
instance->SetData(DATA_MAGTHERIDON_EVENT, DONE);
DoScriptText(SAY_DEATH, me);
}
@@ -340,8 +340,8 @@ class boss_magtheridon : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS);
DoZoneInCombat();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -438,8 +438,8 @@ class boss_magtheridon : public CreatureScript
DoCast(me, SPELL_CAMERA_SHAKE, true);
DoCast(me, SPELL_DEBRIS_KNOCKDOWN, true);
if (pInstance)
pInstance->SetData(DATA_COLLAPSE, true);
if (instance)
instance->SetData(DATA_COLLAPSE, true);
}
if (Phase3)
@@ -483,10 +483,10 @@ class mob_hellfire_channeler : public CreatureScript
{
mob_hellfire_channelerAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 ShadowBoltVolley_Timer;
uint32 DarkMending_Timer;
@@ -507,8 +507,8 @@ class mob_hellfire_channeler : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS);
if (instance)
instance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS);
me->InterruptNonMeleeSpells(false);
DoZoneInCombat();
@@ -516,8 +516,8 @@ class mob_hellfire_channeler : public CreatureScript
void JustReachedHome()
{
if (pInstance)
pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED);
if (instance)
instance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED);
DoCast(me, SPELL_SHADOW_GRASP_C, false);
}
@@ -535,8 +535,8 @@ class mob_hellfire_channeler : public CreatureScript
void JustDied(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_CHANNELER_EVENT, DONE);
if (instance)
instance->SetData(DATA_CHANNELER_EVENT, DONE);
}
void UpdateAI(const uint32 diff)
@@ -599,14 +599,14 @@ public:
bool OnGossipHello(Player* player, GameObject* pGO)
{
InstanceScript* pInstance = pGO->GetInstanceScript();
InstanceScript* instance = pGO->GetInstanceScript();
if (!pInstance)
if (!instance)
return true;
if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS)
if (instance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS)
return true;
Creature* Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON));
Creature* Magtheridon =Unit::GetCreature(*pGO, instance->GetData64(DATA_MAGTHERIDON));
if (!Magtheridon || !Magtheridon->isAlive())
return true;
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+3 -3
View File
@@ -50,7 +50,7 @@ class instance_magtheridons_lair : public InstanceMapScript
struct instance_magtheridons_lair_InstanceMapScript : public InstanceScript
{
instance_magtheridons_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map)
{
}
@@ -250,9 +250,9 @@ class instance_magtheridons_lair : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_magtheridons_lair_InstanceMapScript(pMap);
return new instance_magtheridons_lair_InstanceMapScript(map);
}
};
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+20 -20
View File
@@ -91,10 +91,10 @@ class boss_grand_warlock_nethekurse : public CreatureScript
{
boss_grand_warlock_nethekurseAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
bool IntroOnce;
bool IsIntroEvent;
@@ -193,8 +193,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript
IntroOnce = true;
IsIntroEvent = true;
if (pInstance)
pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
}
if (IsIntroEvent || !IsMainEvent)
@@ -228,21 +228,21 @@ class boss_grand_warlock_nethekurse : public CreatureScript
{
DoScriptText(SAY_DIE, me);
if (!pInstance)
if (!instance)
return;
pInstance->SetData(TYPE_NETHEKURSE, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true);
instance->SetData(TYPE_NETHEKURSE, DONE);
instance->HandleGameObject(instance->GetData64(DATA_NETHEKURSE_DOOR), true);
}
void UpdateAI(const uint32 diff)
{
if (IsIntroEvent)
{
if (!pInstance)
if (!instance)
return;
if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
if (instance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
{
if (IntroEvent_Timer <= diff)
DoTauntPeons();
@@ -320,10 +320,10 @@ class mob_fel_orc_convert : public CreatureScript
{
mob_fel_orc_convertAI(Creature* creature) : ScriptedAI(creature)
{
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint32 Hemorrhage_Timer;
void Reset()
@@ -338,19 +338,19 @@ class mob_fel_orc_convert : public CreatureScript
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
if (instance)
{
if (pInstance->GetData64(DATA_NETHEKURSE))
if (instance->GetData64(DATA_NETHEKURSE))
{
Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE));
Creature* pKurse = Unit::GetCreature(*me, instance->GetData64(DATA_NETHEKURSE));
if (pKurse && me->IsWithinDist(pKurse, 45.0f))
{
CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro();
if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
if (instance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
return;
else
pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
instance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
}
}
}
@@ -358,12 +358,12 @@ class mob_fel_orc_convert : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (pInstance)
if (instance)
{
if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS)
if (instance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS)
return;
if (pInstance->GetData64(DATA_NETHEKURSE))
if (Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)))
if (instance->GetData64(DATA_NETHEKURSE))
if (Creature* pKurse = Unit::GetCreature(*me, instance->GetData64(DATA_NETHEKURSE)))
CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath();
}
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+8 -8
View File
@@ -164,10 +164,10 @@ class boss_warbringer_omrogg : public CreatureScript
{
LeftHeadGUID = 0;
RightHeadGUID = 0;
pInstance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* pInstance;
InstanceScript* instance;
uint64 LeftHeadGUID;
uint64 RightHeadGUID;
@@ -215,8 +215,8 @@ class boss_warbringer_omrogg : public CreatureScript
ThunderClap_Timer = 15000;
ResetThreat_Timer = 30000;
if (pInstance)
pInstance->SetData(TYPE_OMROGG, NOT_STARTED); //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid.
if (instance)
instance->SetData(TYPE_OMROGG, NOT_STARTED); //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid.
}
void DoYellForThreat()
@@ -252,8 +252,8 @@ class boss_warbringer_omrogg : public CreatureScript
AggroYell = true;
}
if (pInstance)
pInstance->SetData(TYPE_OMROGG, IN_PROGRESS);
if (instance)
instance->SetData(TYPE_OMROGG, IN_PROGRESS);
}
void JustSummoned(Creature* summoned)
@@ -307,8 +307,8 @@ class boss_warbringer_omrogg : public CreatureScript
CAST_AI(mob_omrogg_heads::mob_omrogg_headsAI, CAST_CRE(pRightHead)->AI())->DoDeathYell();
if (pInstance)
pInstance->SetData(TYPE_OMROGG, DONE);
if (instance)
instance->SetData(TYPE_OMROGG, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ class instance_shattered_halls : public InstanceMapScript
}
struct instance_shattered_halls_InstanceMapScript : public InstanceScript
{
instance_shattered_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 nethekurseGUID;
@@ -111,9 +111,9 @@ class instance_shattered_halls : public InstanceMapScript
}
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_shattered_halls_InstanceMapScript(pMap);
return new instance_shattered_halls_InstanceMapScript(map);
}
};