diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-10-26 17:06:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-10-26 17:06:50 +0200 |
| commit | 75a790ca475c6af31730d331a3ab185f8abdd6e2 (patch) | |
| tree | f961f8de614ac7e1dfc1f17c68e83c7d14feff20 /src/server/scripts/EasternKingdoms/MagistersTerrace | |
| parent | 8d6aec608f0cd323d291dc12efce32f630590a23 (diff) | |
| parent | b81bf7d0250939ee96b942f554c16d950f06c7b1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts/EasternKingdoms/MagistersTerrace')
5 files changed, 11 insertions, 11 deletions
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 74d65480611..dc8f8bb185a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -600,7 +600,7 @@ public: struct npc_felkael_phoenix_eggAI : public ScriptedAI { - npc_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) {} + npc_felkael_phoenix_eggAI(Creature* creature) : ScriptedAI(creature) { } uint32 HatchTimer; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 03c06664edf..c8ab4a147ff 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -510,7 +510,7 @@ public: struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI { //Rogue - boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } uint32 Gouge_Timer; uint32 Kick_Timer; @@ -614,7 +614,7 @@ public: struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI { //Warlock - boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } uint32 Immolate_Timer; uint32 Shadow_Bolt_Timer; @@ -705,7 +705,7 @@ public: struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI { //Monk - boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } uint32 Knockdown_Timer; uint32 Snap_Kick_Timer; @@ -766,7 +766,7 @@ public: struct boss_yazzaiAI : public boss_priestess_lackey_commonAI { //Mage - boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } bool HasIceBlocked; @@ -896,7 +896,7 @@ public: struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI { //Warrior - boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } uint32 Intercept_Stun_Timer; uint32 Disarm_Timer; @@ -1127,7 +1127,7 @@ public: struct boss_apokoAI : public boss_priestess_lackey_commonAI { //Shaman - boss_apokoAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_apokoAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } uint32 Totem_Timer; uint8 Totem_Amount; @@ -1225,7 +1225,7 @@ public: struct boss_zelfanAI : public boss_priestess_lackey_commonAI { //Engineer - boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {} + boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) { } uint32 Goblin_Dragon_Gun_Timer; uint32 Rocket_Launch_Timer; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 668f7ec58f4..a514f723900 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -332,7 +332,7 @@ public: struct npc_fel_crystalAI : public ScriptedAI { - npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) {} + npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) { } void Reset() OVERRIDE {} void EnterCombat(Unit* /*who*/) OVERRIDE {} diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 54323b5c133..f7abb46b9b7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -62,7 +62,7 @@ public: struct instance_magisters_terrace_InstanceMapScript : public InstanceScript { - instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) {} + instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) { } uint32 Encounter[MAX_ENCOUNTER]; uint32 DelrissaDeathCount; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 6fcc050a55e..c9e530bce56 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -115,7 +115,7 @@ public: struct npc_kalecgosAI : public ScriptedAI { - npc_kalecgosAI(Creature* creature) : ScriptedAI(creature) {} + npc_kalecgosAI(Creature* creature) : ScriptedAI(creature) { } uint32 m_uiTransformTimer; |
