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

Core/Script: Clean-Up in Scripts.

Browse Source 
InstanceScript* m_instance -> InstanceScript* instance

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-16 19:35:13 +08:00
parent 76c18e00c7
commit ddc0f5d7d6
19 changed files with 454 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+9 -9
View File
@@ -61,10 +61,10 @@ class boss_arlokk : public CreatureScript
{
boss_arlokkAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* m_instance;
InstanceScript* instance;
uint32 m_uiShadowWordPain_Timer;
uint32 m_uiGouge_Timer;
@@ -110,8 +110,8 @@ class boss_arlokk : public CreatureScript
void JustReachedHome()
{
if (m_instance)
m_instance->SetData(DATA_ARLOKK, NOT_STARTED);
if (instance)
instance->SetData(DATA_ARLOKK, NOT_STARTED);
//we should be summoned, so despawn
me->DespawnOrUnsummon();
@@ -124,8 +124,8 @@ class boss_arlokk : public CreatureScript
me->SetDisplayId(MODEL_ID_NORMAL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
if (m_instance)
m_instance->SetData(DATA_ARLOKK, DONE);
if (instance)
instance->SetData(DATA_ARLOKK, DONE);
}
void DoSummonPhanters()
@@ -271,12 +271,12 @@ class go_gong_of_bethekk : public GameObjectScript
bool OnGossipHello(Player* /*player*/, GameObject* go)
{
if (InstanceScript* m_instance = go->GetInstanceScript())
if (InstanceScript* instance = go->GetInstanceScript())
{
if (m_instance->GetData(DATA_ARLOKK) == DONE || m_instance->GetData(DATA_ARLOKK) == IN_PROGRESS)
if (instance->GetData(DATA_ARLOKK) == DONE || instance->GetData(DATA_ARLOKK) == IN_PROGRESS)
return true;
m_instance->SetData(DATA_ARLOKK, IN_PROGRESS);
instance->SetData(DATA_ARLOKK, IN_PROGRESS);
return true;
}
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+12 -12
View File
@@ -57,10 +57,10 @@ class boss_hakkar : public CreatureScript
{
boss_hakkarAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* m_instance;
InstanceScript* instance;
uint32 BloodSiphon_Timer;
uint32 CorruptedBlood_Timer;
@@ -156,9 +156,9 @@ class boss_hakkar : public CreatureScript
//Checking if Jeklik is dead. If not we cast her Aspect
if (CheckJeklik_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_JEKLIK) != DONE)
if (instance->GetData(DATA_JEKLIK) != DONE)
{
if (AspectOfJeklik_Timer <= diff)
{
@@ -173,9 +173,9 @@ class boss_hakkar : public CreatureScript
//Checking if Venoxis is dead. If not we cast his Aspect
if (CheckVenoxis_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_VENOXIS) != DONE)
if (instance->GetData(DATA_VENOXIS) != DONE)
{
if (AspectOfVenoxis_Timer <= diff)
{
@@ -190,9 +190,9 @@ class boss_hakkar : public CreatureScript
//Checking if Marli is dead. If not we cast her Aspect
if (CheckMarli_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_MARLI) != DONE)
if (instance->GetData(DATA_MARLI) != DONE)
{
if (AspectOfMarli_Timer <= diff)
{
@@ -208,9 +208,9 @@ class boss_hakkar : public CreatureScript
//Checking if Thekal is dead. If not we cast his Aspect
if (CheckThekal_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_THEKAL) != DONE)
if (instance->GetData(DATA_THEKAL) != DONE)
{
if (AspectOfThekal_Timer <= diff)
{
@@ -225,9 +225,9 @@ class boss_hakkar : public CreatureScript
//Checking if Arlokk is dead. If yes we cast her Aspect
if (CheckArlokk_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_ARLOKK) != DONE)
if (instance->GetData(DATA_ARLOKK) != DONE)
{
if (AspectOfArlokk_Timer <= diff)
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+8 -8
View File
@@ -56,10 +56,10 @@ class boss_jeklik : public CreatureScript
{
boss_jeklikAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* m_instance;
InstanceScript* instance;
uint32 Charge_Timer;
uint32 SonicBurst_Timer;
@@ -98,8 +98,8 @@ class boss_jeklik : public CreatureScript
{
DoScriptText(SAY_DEATH, me);
if (m_instance)
m_instance->SetData(DATA_JEKLIK, DONE);
if (instance)
instance->SetData(DATA_JEKLIK, DONE);
}
void UpdateAI(const uint32 diff)
@@ -238,10 +238,10 @@ class mob_batrider : public CreatureScript
{
mob_batriderAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* m_instance;
InstanceScript* instance;
uint32 Bomb_Timer;
uint32 Check_Timer;
@@ -274,9 +274,9 @@ class mob_batrider : public CreatureScript
//Check_Timer
if (Check_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_JEKLIK) == DONE)
if (instance->GetData(DATA_JEKLIK) == DONE)
{
me->setDeathState(JUST_DIED);
me->RemoveCorpse();
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+10 -10
View File
@@ -57,7 +57,7 @@ class boss_mandokir : public CreatureScript
{
boss_mandokirAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint32 KillCount;
@@ -72,7 +72,7 @@ class boss_mandokir : public CreatureScript
float targetY;
float targetZ;
InstanceScript* m_instance;
InstanceScript* instance;
bool endWatch;
bool someWatched;
@@ -116,9 +116,9 @@ class boss_mandokir : public CreatureScript
{
DoScriptText(SAY_DING_KILL, me);
if (m_instance)
if (instance)
{
uint64 JindoGUID = m_instance->GetData64(DATA_JINDO);
uint64 JindoGUID = instance->GetData64(DATA_JINDO);
if (JindoGUID)
{
if (Unit* jTemp = Unit::GetUnit(*me, JindoGUID))
@@ -256,9 +256,9 @@ class boss_mandokir : public CreatureScript
//Checking if Ohgan is dead. If yes Mandokir will enrage.
if (Check_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_OHGAN) == DONE)
if (instance->GetData(DATA_OHGAN) == DONE)
{
if (!RaptorDead)
{
@@ -296,11 +296,11 @@ class mob_ohgan : public CreatureScript
{
mob_ohganAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint32 SunderArmor_Timer;
InstanceScript* m_instance;
InstanceScript* instance;
void Reset()
{
@@ -311,8 +311,8 @@ class mob_ohgan : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
if (m_instance)
m_instance->SetData(DATA_OHGAN, DONE);
if (instance)
instance->SetData(DATA_OHGAN, DONE);
}
void UpdateAI (const uint32 diff)
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+4 -4
View File
@@ -53,10 +53,10 @@ class boss_marli : public CreatureScript
{
boss_marliAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* m_instance;
InstanceScript* instance;
uint32 SpawnStartSpiders_Timer;
uint32 PoisonVolley_Timer;
@@ -91,8 +91,8 @@ class boss_marli : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
DoScriptText(SAY_DEATH, me);
if (m_instance)
m_instance->SetData(DATA_MARLI, DONE);
if (instance)
instance->SetData(DATA_MARLI, DONE);
}
void UpdateAI(const uint32 diff)
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+40 -40
View File
@@ -68,7 +68,7 @@ class boss_thekal : public CreatureScript
{
boss_thekalAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint32 MortalCleave_Timer;
@@ -81,7 +81,7 @@ class boss_thekal : public CreatureScript
uint32 Check_Timer;
uint32 Resurrect_Timer;
InstanceScript* m_instance;
InstanceScript* instance;
bool Enraged;
bool PhaseTwo;
bool WasDead;
@@ -111,14 +111,14 @@ class boss_thekal : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
DoScriptText(SAY_DEATH, me);
if (m_instance)
m_instance->SetData(DATA_THEKAL, DONE);
if (instance)
instance->SetData(DATA_THEKAL, DONE);
}
void JustReachedHome()
{
if (m_instance)
m_instance->SetData(DATA_THEKAL, NOT_STARTED);
if (instance)
instance->SetData(DATA_THEKAL, NOT_STARTED);
}
void UpdateAI(const uint32 diff)
@@ -129,26 +129,26 @@ class boss_thekal : public CreatureScript
//Check_Timer for the death of LorKhan and Zath.
if (!WasDead && Check_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_LORKHAN) == SPECIAL)
if (instance->GetData(DATA_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit* pLorKhan = Unit::GetUnit((*me), m_instance->GetData64(DATA_LORKHAN)))
if (Unit* pLorKhan = Unit::GetUnit((*me), instance->GetData64(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->setFaction(14);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pLorKhan->SetFullHealth();
m_instance->SetData(DATA_LORKHAN, DONE);
instance->SetData(DATA_LORKHAN, DONE);
}
}
if (m_instance->GetData(DATA_ZATH) == SPECIAL)
if (instance->GetData(DATA_ZATH) == SPECIAL)
{
//Resurrect Zath
Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH));
Unit* pZath = Unit::GetUnit((*me), instance->GetData64(DATA_ZATH));
if (pZath)
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
@@ -156,7 +156,7 @@ class boss_thekal : public CreatureScript
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
pZath->SetFullHealth();
m_instance->SetData(DATA_ZATH, DONE);
instance->SetData(DATA_ZATH, DONE);
}
}
}
@@ -185,8 +185,8 @@ class boss_thekal : public CreatureScript
me->SetStandState(UNIT_STAND_STATE_SLEEP);
me->AttackStop();
if (m_instance)
m_instance->SetData(DATA_THEKAL, SPECIAL);
if (instance)
instance->SetData(DATA_THEKAL, SPECIAL);
WasDead=true;
}
@@ -279,7 +279,7 @@ class mob_zealot_lorkhan : public CreatureScript
{
mob_zealot_lorkhanAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint32 Shield_Timer;
@@ -290,7 +290,7 @@ class mob_zealot_lorkhan : public CreatureScript
bool FakeDeath;
InstanceScript* m_instance;
InstanceScript* instance;
void Reset()
{
@@ -302,8 +302,8 @@ class mob_zealot_lorkhan : public CreatureScript
FakeDeath = false;
if (m_instance)
m_instance->SetData(DATA_LORKHAN, NOT_STARTED);
if (instance)
instance->SetData(DATA_LORKHAN, NOT_STARTED);
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -335,10 +335,10 @@ class mob_zealot_lorkhan : public CreatureScript
//Casting Greaterheal to Thekal or Zath if they are in meele range.
if (GreaterHeal_Timer <= diff)
{
if (m_instance)
if (instance)
{
Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL));
Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH));
Unit* pThekal = Unit::GetUnit((*me), instance->GetData64(DATA_THEKAL));
Unit* pZath = Unit::GetUnit((*me), instance->GetData64(DATA_ZATH));
if (!pThekal || !pZath)
return;
@@ -369,12 +369,12 @@ class mob_zealot_lorkhan : public CreatureScript
//Check_Timer for the death of LorKhan and Zath.
if (!FakeDeath && Check_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_THEKAL) == SPECIAL)
if (instance->GetData(DATA_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL)))
if (Unit* pThekal = Unit::GetUnit((*me), instance->GetData64(DATA_THEKAL)))
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -383,10 +383,10 @@ class mob_zealot_lorkhan : public CreatureScript
}
}
if (m_instance->GetData(DATA_ZATH) == SPECIAL)
if (instance->GetData(DATA_ZATH) == SPECIAL)
{
//Resurrect Zath
if (Unit* pZath = Unit::GetUnit((*me), m_instance->GetData64(DATA_ZATH)))
if (Unit* pZath = Unit::GetUnit((*me), instance->GetData64(DATA_ZATH)))
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -409,8 +409,8 @@ class mob_zealot_lorkhan : public CreatureScript
me->setFaction(35);
me->AttackStop();
if (m_instance)
m_instance->SetData(DATA_LORKHAN, SPECIAL);
if (instance)
instance->SetData(DATA_LORKHAN, SPECIAL);
FakeDeath = true;
}
@@ -439,7 +439,7 @@ class mob_zealot_zath : public CreatureScript
{
mob_zealot_zathAI(Creature* creature) : ScriptedAI(creature)
{
m_instance = creature->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint32 SweepingStrikes_Timer;
@@ -451,7 +451,7 @@ class mob_zealot_zath : public CreatureScript
bool FakeDeath;
InstanceScript* m_instance;
InstanceScript* instance;
void Reset()
{
@@ -464,8 +464,8 @@ class mob_zealot_zath : public CreatureScript
FakeDeath = false;
if (m_instance)
m_instance->SetData(DATA_ZATH, NOT_STARTED);
if (instance)
instance->SetData(DATA_ZATH, NOT_STARTED);
me->SetStandState(UNIT_STAND_STATE_STAND);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -522,12 +522,12 @@ class mob_zealot_zath : public CreatureScript
//Check_Timer for the death of LorKhan and Zath.
if (!FakeDeath && Check_Timer <= diff)
{
if (m_instance)
if (instance)
{
if (m_instance->GetData(DATA_LORKHAN) == SPECIAL)
if (instance->GetData(DATA_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit* pLorKhan = Unit::GetUnit((*me), m_instance->GetData64(DATA_LORKHAN)))
if (Unit* pLorKhan = Unit::GetUnit((*me), instance->GetData64(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -536,10 +536,10 @@ class mob_zealot_zath : public CreatureScript
}
}
if (m_instance->GetData(DATA_THEKAL) == SPECIAL)
if (instance->GetData(DATA_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit* pThekal = Unit::GetUnit((*me), m_instance->GetData64(DATA_THEKAL)))
if (Unit* pThekal = Unit::GetUnit((*me), instance->GetData64(DATA_THEKAL)))
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -562,8 +562,8 @@ class mob_zealot_zath : public CreatureScript
me->setFaction(35);
me->AttackStop();
if (m_instance)
m_instance->SetData(DATA_ZATH, SPECIAL);
if (instance)
instance->SetData(DATA_ZATH, SPECIAL);
FakeDeath = true;
}