aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland/TempestKeep
diff options
context:
space:
mode:
authorazazel <none@none>2010-08-08 22:54:58 +0600
committerazazel <none@none>2010-08-08 22:54:58 +0600
commit590199d8e17405a0717eaf2e2d39f0d671b6f844 (patch)
tree36755767c89c4639c7cb0e2f31d8a99f53bb8cf5 /src/server/scripts/Outland/TempestKeep
parent8a69e50d6aff8ea75100a1fb660deecf03b3ea07 (diff)
* Rename InstanceData to InstanceScript
* 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
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp10
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp6
11 files changed, 37 insertions, 37 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index e529f41a7cf..ac5732d4927 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -82,11 +82,11 @@ class boss_alar : public CreatureScript
{
boss_alarAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
DefaultMoveSpeedRate = pCreature->GetSpeedRate(MOVE_RUN);
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
WaitEventType WaitEvent;
uint32 WaitTimer;
@@ -469,12 +469,12 @@ class mob_ember_of_alar : public CreatureScript
{
mob_ember_of_alarAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
pCreature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING);
pCreature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
bool toDie;
void Reset()
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index c3090b6219a..1326f11e187 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -84,13 +84,13 @@ class boss_high_astromancer_solarian : public CreatureScript
{
boss_high_astromancer_solarianAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
defaultarmor = pCreature->GetArmor();
defaultsize = pCreature->GetFloatValue(OBJECT_FIELD_SCALE_X);
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
SummonList Summons;
uint8 Phase;
@@ -418,10 +418,10 @@ class mob_solarium_priest : public CreatureScript
{
mob_solarium_priestAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
uint32 healTimer;
uint32 holysmiteTimer;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 86b6de83377..c59dca949ca 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -147,11 +147,11 @@ struct advisorbase_ai : public ScriptedAI
{
advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature)
{
- m_pInstance = pCreature->GetInstanceData();
+ m_pInstance = pCreature->GetInstanceScript();
m_bDoubled_Health = false;
}
- ScriptedInstance* m_pInstance;
+ InstanceScript* m_pInstance;
bool FakeDeath;
bool m_bDoubled_Health;
uint32 DelayRes_Timer;
@@ -281,11 +281,11 @@ class boss_kaelthas : public CreatureScript
{
boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me)
{
- m_pInstance = pCreature->GetInstanceData();
+ m_pInstance = pCreature->GetInstanceScript();
memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid));
}
- ScriptedInstance* m_pInstance;
+ InstanceScript* m_pInstance;
uint32 Fireball_Timer;
uint32 ArcaneDisruption_Timer;
@@ -1573,7 +1573,7 @@ class mob_phoenix_egg_tk : public CreatureScript
}
};
- CreatureAI* GetAI_mob_phoenix_egg_tk(Creature* pCreature)
+ CreatureAI* GetAI(Creature* pCreature) const
{
return new mob_phoenix_egg_tkAI(pCreature);
}
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 0b2656496ad..0e9e81b3b24 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -55,10 +55,10 @@ class boss_void_reaver : public CreatureScript
{
boss_void_reaverAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
}
- ScriptedInstance* pInstance;
+ InstanceScript* pInstance;
uint32 Pounding_Timer;
uint32 ArcaneOrb_Timer;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 8fee87e39fd..7e717b204c5 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -43,9 +43,9 @@ class instance_mechanar : public InstanceMapScript
{
}
- struct instance_the_eye_InstanceMapScript : public ScriptedInstance
+ struct instance_the_eye_InstanceMapScript : public InstanceScript
{
- instance_the_eye_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
+ instance_the_eye_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
uint64 ThaladredTheDarkener;
uint64 LordSanguinar;
@@ -194,7 +194,7 @@ class instance_mechanar : public InstanceMapScript
}
};
- InstanceData* GetInstanceData(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* pMap) const
{
return new instance_the_eye_InstanceMapScript(pMap);
}
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 0cee180e88e..083842fd638 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -63,10 +63,10 @@ class boss_nethermancer_sepethrea : public CreatureScript
{
boss_nethermancer_sepethreaAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
uint32 frost_attack_Timer;
uint32 arcane_blast_Timer;
@@ -186,10 +186,10 @@ class mob_ragin_flames : public CreatureScript
{
mob_ragin_flamesAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
uint32 inferno_Timer;
uint32 flame_timer;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 2eaad3cd978..eae3b0ff1d9 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -192,7 +192,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
}
};
- CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature* pCreature)
+ CreatureAI* GetAI(Creature* pCreature) const
{
return new boss_pathaleon_the_calculatorAI (pCreature);
}
@@ -267,7 +267,7 @@ class mob_nether_wraith : public CreatureScript
}
};
- CreatureAI* GetAI_mob_nether_wraith(Creature* pCreature)
+ CreatureAI* GetAI(Creature* pCreature) const
{
return new mob_nether_wraithAI (pCreature);
}
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index 31d10313c7c..aa992098a67 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -36,9 +36,9 @@ class instance_mechanar : public InstanceMapScript
{
}
- struct instance_mechanar_InstanceMapScript : public ScriptedInstance
+ struct instance_mechanar_InstanceMapScript : public InstanceScript
{
- instance_mechanar_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) { Initialize(); };
+ instance_mechanar_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -79,7 +79,7 @@ class instance_mechanar : public InstanceMapScript
}
}
};
- InstanceData* GetInstanceData(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* pMap) const
{
return new instance_mechanar_InstanceMapScript(pMap);
}
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 18cd75b256e..2220526111c 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -78,10 +78,10 @@ class npc_millhouse_manastorm : public CreatureScript
{
npc_millhouse_manastormAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
}
- ScriptedInstance* pInstance;
+ InstanceScript* pInstance;
uint32 EventProgress_Timer;
uint32 Phase;
@@ -282,10 +282,10 @@ class npc_warden_mellichar : public CreatureScript
{
npc_warden_mellicharAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
}
- ScriptedInstance* pInstance;
+ InstanceScript* pInstance;
bool IsRunning;
bool CanSpawn;
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 63e522ad63d..076d1223f1a 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -70,11 +70,11 @@ class boss_harbinger_skyriss : public CreatureScript
{
boss_harbinger_skyrissAI(Creature* pCreature) : ScriptedAI(pCreature)
{
- pInstance = pCreature->GetInstanceData();
+ pInstance = pCreature->GetInstanceScript();
Intro = false;
}
- ScriptedInstance *pInstance;
+ InstanceScript *pInstance;
bool Intro;
bool IsImage33;
@@ -272,7 +272,7 @@ class boss_harbinger_skyriss : public CreatureScript
}
};
- CreatureAI* GetAI_boss_harbinger_skyriss(Creature* pCreature)
+ CreatureAI* GetAI(Creature* pCreature) const
{
return new boss_harbinger_skyrissAI (pCreature);
}
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index c06cb6a4d07..7a2d10db48d 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -58,9 +58,9 @@ class instance_arcatraz : public InstanceMapScript
: InstanceMapScript("instance_arcatraz")
{
}
- struct instance_arcatraz_InstanceMapScript : public ScriptedInstance
+ struct instance_arcatraz_InstanceMapScript : public InstanceScript
{
- instance_arcatraz_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) { Initialize(); };
+ instance_arcatraz_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -229,7 +229,7 @@ class instance_arcatraz : public InstanceMapScript
}
};
- InstanceData* GetInstanceData(InstanceMap* pMap) const
+ InstanceScript* GetInstanceScript(InstanceMap* pMap) const
{
return new instance_arcatraz_InstanceMapScript(pMap);
}