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

* Rename InstanceData to InstanceScript

Browse Source 
* Rename *mgr to their new names in scripts project
* Mass convert all the scripts (NEEDS THOROUGH TESTING, because it was done automatically) Please, report bugs on issue tracker.

--HG--
branch : trunk
rename : src/server/game/Instances/InstanceData.cpp => src/server/game/Instances/InstanceScript.cpp
rename : src/server/game/Instances/InstanceData.h => src/server/game/Instances/InstanceScript.h
This commit is contained in:
azazel
2010-08-08 22:54:58 +06:00
parent 8a69e50d6a
commit 590199d8e1
482 changed files with 84476 additions and 82697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+3 -3
View File
@@ -61,10 +61,10 @@ class boss_arlokk : public CreatureScript
{
boss_arlokkAI(Creature* pCreature) : ScriptedAI(pCreature)
{
m_pInstance = pCreature->GetInstanceData();
m_pInstance = pCreature->GetInstanceScript();
}
ScriptedInstance* m_pInstance;
InstanceScript* m_pInstance;
uint32 m_uiShadowWordPain_Timer;
uint32 m_uiGouge_Timer;
@@ -271,7 +271,7 @@ class go_gong_of_bethekk : public GameObjectScript
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo)
{
if (ScriptedInstance* m_pInstance = pGo->GetInstanceData())
if (InstanceScript* m_pInstance = pGo->GetInstanceScript())
{
if (m_pInstance->GetData(TYPE_ARLOKK) == DONE || m_pInstance->GetData(TYPE_ARLOKK) == IN_PROGRESS)
return true;
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+2 -2
View File
@@ -57,10 +57,10 @@ class boss_hakkar : public CreatureScript
{
boss_hakkarAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
uint32 BloodSiphon_Timer;
uint32 CorruptedBlood_Timer;
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+4 -4
View File
@@ -56,10 +56,10 @@ class boss_jeklik : public CreatureScript
{
boss_jeklikAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
uint32 Charge_Timer;
uint32 SonicBurst_Timer;
@@ -238,10 +238,10 @@ class mob_batrider : public CreatureScript
{
mob_batriderAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
uint32 Bomb_Timer;
uint32 Check_Timer;
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+2 -2
View File
@@ -189,12 +189,12 @@ class mob_healing_ward : public CreatureScript
{
mob_healing_wardAI(Creature *c) : ScriptedAI(c)
{
pInstance = c->GetInstanceData();
pInstance = c->GetInstanceScript();
}
uint32 Heal_Timer;
ScriptedInstance *pInstance;
InstanceScript *pInstance;
void Reset()
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+4 -4
View File
@@ -57,7 +57,7 @@ class boss_mandokir : public CreatureScript
{
boss_mandokirAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
uint32 KillCount;
@@ -72,7 +72,7 @@ class boss_mandokir : public CreatureScript
float targetY;
float targetZ;
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
bool endWatch;
bool someWatched;
@@ -296,11 +296,11 @@ class mob_ohgan : public CreatureScript
{
mob_ohganAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
uint32 SunderArmor_Timer;
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
void Reset()
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+3 -4
View File
@@ -53,10 +53,10 @@ class boss_marli : public CreatureScript
{
boss_marliAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
uint32 SpawnStartSpiders_Timer;
uint32 PoisonVolley_Timer;
@@ -211,11 +211,10 @@ class boss_marli : public CreatureScript
}
}
};
CreatureAI* GetAI(Creature* creature) const
{
return new example_creatureAI(creature);
return new boss_marliAI(creature);
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+6 -6
View File
@@ -68,7 +68,7 @@ class boss_thekal : public CreatureScript
{
boss_thekalAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
uint32 MortalCleave_Timer;
@@ -81,7 +81,7 @@ class boss_thekal : public CreatureScript
uint32 Check_Timer;
uint32 Resurrect_Timer;
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
bool Enraged;
bool PhaseTwo;
bool WasDead;
@@ -276,7 +276,7 @@ class mob_zealot_lorkhan : public CreatureScript
{
mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
uint32 Shield_Timer;
@@ -287,7 +287,7 @@ class mob_zealot_lorkhan : public CreatureScript
bool FakeDeath;
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
void Reset()
{
@@ -433,7 +433,7 @@ class mob_zealot_zath : public CreatureScript
{
mob_zealot_zathAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
uint32 SweepingStrikes_Timer;
@@ -445,7 +445,7 @@ class mob_zealot_zath : public CreatureScript
bool FakeDeath;
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
void Reset()
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+2 -2
View File
@@ -52,10 +52,10 @@ class boss_venoxis : public CreatureScript
{
boss_venoxisAI(Creature *c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceData();
m_pInstance = c->GetInstanceScript();
}
ScriptedInstance *m_pInstance;
InstanceScript *m_pInstance;
uint32 HolyFire_Timer;
uint32 HolyWrath_Timer;
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+3 -3
View File
@@ -34,9 +34,9 @@ class instance_zulgurub : public InstanceMapScript
{
}
struct instance_zulgurub_InstanceMapScript : public ScriptedInstance
struct instance_zulgurub_InstanceMapScript : public InstanceScript
{
instance_zulgurub(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
instance_zulgurub_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
//If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too.
uint32 m_auiEncounter[MAX_ENCOUNTERS];
@@ -153,7 +153,7 @@ class instance_zulgurub : public InstanceMapScript
}
};
InstanceData* OnGetInstanceData(InstanceMap* pMap)
InstanceScript* OnGetInstanceData(InstanceMap* pMap)
{
return new instance_zulgurub_InstanceMapScript(pMap);
}