aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland/TempestKeep
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-10-26 17:06:50 +0200
committerShauren <shauren.trinity@gmail.com>2013-10-26 17:06:50 +0200
commit75a790ca475c6af31730d331a3ab185f8abdd6e2 (patch)
treef961f8de614ac7e1dfc1f17c68e83c7d14feff20 /src/server/scripts/Outland/TempestKeep
parent8d6aec608f0cd323d291dc12efce32f630590a23 (diff)
parentb81bf7d0250939ee96b942f554c16d950f06c7b1 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp12
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp2
11 files changed, 20 insertions, 20 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 8b2cce69dc7..59638a6f80f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -539,7 +539,7 @@ class npc_flame_patch_alar : public CreatureScript
struct npc_flame_patch_alarAI : public ScriptedAI
{
- npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
void AttackStart(Unit* /*who*/) OVERRIDE {}
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index cf25efb17c6..984844c3fa7 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1026,7 +1026,7 @@ class boss_thaladred_the_darkener : public CreatureScript
}
struct boss_thaladred_the_darkenerAI : public advisorbase_ai
{
- boss_thaladred_the_darkenerAI(Creature* creature) : advisorbase_ai(creature) {}
+ boss_thaladred_the_darkenerAI(Creature* creature) : advisorbase_ai(creature) { }
uint32 Gaze_Timer;
uint32 Silence_Timer;
@@ -1124,7 +1124,7 @@ class boss_lord_sanguinar : public CreatureScript
}
struct boss_lord_sanguinarAI : public advisorbase_ai
{
- boss_lord_sanguinarAI(Creature* creature) : advisorbase_ai(creature) {}
+ boss_lord_sanguinarAI(Creature* creature) : advisorbase_ai(creature) { }
uint32 Fear_Timer;
@@ -1191,7 +1191,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
}
struct boss_grand_astromancer_capernianAI : public advisorbase_ai
{
- boss_grand_astromancer_capernianAI(Creature* creature) : advisorbase_ai(creature) {}
+ boss_grand_astromancer_capernianAI(Creature* creature) : advisorbase_ai(creature) { }
uint32 Fireball_Timer;
uint32 Conflagration_Timer;
@@ -1336,7 +1336,7 @@ class boss_master_engineer_telonicus : public CreatureScript
}
struct boss_master_engineer_telonicusAI : public advisorbase_ai
{
- boss_master_engineer_telonicusAI(Creature* creature) : advisorbase_ai(creature) {}
+ boss_master_engineer_telonicusAI(Creature* creature) : advisorbase_ai(creature) { }
uint32 Bomb_Timer;
uint32 RemoteToy_Timer;
@@ -1487,7 +1487,7 @@ class npc_phoenix_tk : public CreatureScript
}
struct npc_phoenix_tkAI : public ScriptedAI
{
- npc_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_phoenix_tkAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Cycle_Timer;
@@ -1541,7 +1541,7 @@ class npc_phoenix_egg_tk : public CreatureScript
}
struct npc_phoenix_egg_tkAI : public ScriptedAI
{
- npc_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Rebirth_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 9995efee99a..f5f75d79b63 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -46,7 +46,7 @@ class instance_the_eye : public InstanceMapScript
struct instance_the_eye_InstanceMapScript : public InstanceScript
{
- instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) {}
+ instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint64 ThaladredTheDarkener;
uint64 LordSanguinar;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index ab9b6ab3046..e8d52c3f819 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -47,7 +47,7 @@ class npc_crystalcore_devastator : public CreatureScript
}
struct npc_crystalcore_devastatorAI : public ScriptedAI
{
- npc_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature) { }
uint32 Knockaway_Timer;
uint32 Countercharge_Timer;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index a2c6ba399a3..97a165453f8 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -53,11 +53,11 @@ enum Events
class boss_gatewatcher_gyrokill : public CreatureScript
{
public:
- boss_gatewatcher_gyrokill() : CreatureScript("boss_gatewatcher_gyrokill") {}
+ boss_gatewatcher_gyrokill() : CreatureScript("boss_gatewatcher_gyrokill") { }
struct boss_gatewatcher_gyrokillAI : public BossAI
{
- boss_gatewatcher_gyrokillAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_GYROKILL) {}
+ boss_gatewatcher_gyrokillAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_GYROKILL) { }
void JustDied(Unit* /*killer*/) OVERRIDE
{
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 7dc073d82d7..6a4de059eb7 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -56,11 +56,11 @@ enum Events
class boss_gatewatcher_iron_hand : public CreatureScript
{
public:
- boss_gatewatcher_iron_hand(): CreatureScript("boss_gatewatcher_iron_hand") {}
+ boss_gatewatcher_iron_hand(): CreatureScript("boss_gatewatcher_iron_hand") { }
struct boss_gatewatcher_iron_handAI : public BossAI
{
- boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) {}
+ boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { }
void EnterCombat(Unit* /*who*/) OVERRIDE
{
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 565aefbd6b9..b5172245b49 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -61,11 +61,11 @@ enum Events
class boss_nethermancer_sepethrea : public CreatureScript
{
- public: boss_nethermancer_sepethrea(): CreatureScript("boss_nethermancer_sepethrea") {}
+ public: boss_nethermancer_sepethrea(): CreatureScript("boss_nethermancer_sepethrea") { }
struct boss_nethermancer_sepethreaAI : public BossAI
{
- boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) {}
+ boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { }
void EnterCombat(Unit* who) OVERRIDE
{
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 1bcdcd48fce..822f8f1d486 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
@@ -69,7 +69,7 @@ enum Creatures
class boss_pathaleon_the_calculator : public CreatureScript
{
public:
- boss_pathaleon_the_calculator(): CreatureScript("boss_pathaleon_the_calculator") {}
+ boss_pathaleon_the_calculator(): CreatureScript("boss_pathaleon_the_calculator") { }
struct boss_pathaleon_the_calculatorAI : public BossAI
{
@@ -172,7 +172,7 @@ class npc_nether_wraith : public CreatureScript
struct npc_nether_wraithAI : public ScriptedAI
{
- npc_nether_wraithAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_nether_wraithAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ArcaneMissiles_Timer;
uint32 Detonation_Timer;
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index f03cb033b0f..58b1df439ee 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -539,7 +539,7 @@ class npc_zerekethvoidzone : public CreatureScript
}
struct npc_zerekethvoidzoneAI : public ScriptedAI
{
- npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE
{
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 c7765eb24ad..c4daa3d14a9 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -289,7 +289,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
}
struct boss_harbinger_skyriss_illusionAI : public ScriptedAI
{
- boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) {}
+ boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE {}
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 41b87495c93..e836c5c4bf9 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -60,7 +60,7 @@ class instance_arcatraz : public InstanceMapScript
}
struct instance_arcatraz_InstanceMapScript : public InstanceScript
{
- instance_arcatraz_InstanceMapScript(Map* map) : InstanceScript(map) {}
+ instance_arcatraz_InstanceMapScript(Map* map) : InstanceScript(map) { }
uint32 m_auiEncounter[MAX_ENCOUNTER];