aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
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/World
parent8d6aec608f0cd323d291dc12efce32f630590a23 (diff)
parentb81bf7d0250939ee96b942f554c16d950f06c7b1 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/achievement_scripts.cpp2
-rw-r--r--src/server/scripts/World/areatrigger_scripts.cpp2
-rw-r--r--src/server/scripts/World/go_scripts.cpp2
-rw-r--r--src/server/scripts/World/guards.cpp6
-rw-r--r--src/server/scripts/World/item_scripts.cpp2
-rw-r--r--src/server/scripts/World/mob_generic_creature.cpp4
-rw-r--r--src/server/scripts/World/npcs_special.cpp20
7 files changed, 19 insertions, 19 deletions
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 6cd5e962c02..40af44911ed 100644
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -223,7 +223,7 @@ enum ArgentTournamentAreas
class achievement_tilted : public AchievementCriteriaScript
{
public:
- achievement_tilted() : AchievementCriteriaScript("achievement_tilted") {}
+ achievement_tilted() : AchievementCriteriaScript("achievement_tilted") { }
bool OnCheck(Player* player, Unit* /*target*/) OVERRIDE
{
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 1b43ee30cd1..3ab9a1511af 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -243,7 +243,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript
{
public:
- AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") {}
+ AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE
{
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index b824b7d447e..6f142fda19b 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -872,7 +872,7 @@ public:
class go_soulwell : public GameObjectScript
{
public:
- go_soulwell() : GameObjectScript("go_soulwell") {}
+ go_soulwell() : GameObjectScript("go_soulwell") { }
struct go_soulwellAI : public GameObjectAI
{
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index f83d35b4039..95f97b1dc84 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -54,7 +54,7 @@ public:
struct guard_genericAI : public GuardAI
{
- guard_genericAI(Creature* creature) : GuardAI(creature) {}
+ guard_genericAI(Creature* creature) : GuardAI(creature) { }
void Reset() OVERRIDE
{
@@ -263,7 +263,7 @@ public:
struct guard_shattrath_scryerAI : public GuardAI
{
- guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature) {}
+ guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature) { }
void Reset() OVERRIDE
{
@@ -328,7 +328,7 @@ public:
struct guard_shattrath_aldorAI : public GuardAI
{
- guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature) {}
+ guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature) { }
void Reset() OVERRIDE
{
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 061d423201d..f0bc573a70c 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -172,7 +172,7 @@ public:
class item_disgusting_jar : public ItemScript
{
public:
- item_disgusting_jar() : ItemScript("item_disgusting_jar") {}
+ item_disgusting_jar() : ItemScript("item_disgusting_jar") { }
bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) OVERRIDE
{
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index 3891de93261..ed086712ca2 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -36,7 +36,7 @@ public:
struct generic_creatureAI : public ScriptedAI
{
- generic_creatureAI(Creature* creature) : ScriptedAI(creature) {}
+ generic_creatureAI(Creature* creature) : ScriptedAI(creature) { }
uint32 GlobalCooldown; //This variable acts like the global cooldown that players have (1.5 seconds)
uint32 BuffTimer; //This variable keeps track of buffs
@@ -212,7 +212,7 @@ public:
struct trigger_deathAI : public NullCreatureAI
{
- trigger_deathAI(Creature* creature) : NullCreatureAI(creature) {}
+ trigger_deathAI(Creature* creature) : NullCreatureAI(creature) { }
void JustDied(Unit* killer) OVERRIDE
{
if (me->m_spells[0])
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 0872038d377..023dd416483 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -330,7 +330,7 @@ public:
struct npc_chicken_cluckAI : public ScriptedAI
{
- npc_chicken_cluckAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_chicken_cluckAI(Creature* creature) : ScriptedAI(creature) { }
uint32 ResetFlagTimer;
@@ -425,7 +425,7 @@ public:
struct npc_dancing_flamesAI : public ScriptedAI
{
- npc_dancing_flamesAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_dancing_flamesAI(Creature* creature) : ScriptedAI(creature) { }
bool Active;
uint32 CanIteract;
@@ -566,11 +566,11 @@ uint32 const HordeSoldierId[3] =
class npc_doctor : public CreatureScript
{
public:
- npc_doctor() : CreatureScript("npc_doctor") {}
+ npc_doctor() : CreatureScript("npc_doctor") { }
struct npc_doctorAI : public ScriptedAI
{
- npc_doctorAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_doctorAI(Creature* creature) : ScriptedAI(creature) { }
uint64 PlayerGUID;
@@ -715,7 +715,7 @@ public:
struct npc_injured_patientAI : public ScriptedAI
{
- npc_injured_patientAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_injured_patientAI(Creature* creature) : ScriptedAI(creature) { }
uint64 DoctorGUID;
Location* Coord;
@@ -1117,7 +1117,7 @@ public:
struct npc_guardianAI : public ScriptedAI
{
- npc_guardianAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_guardianAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE
{
@@ -1492,7 +1492,7 @@ public:
struct npc_steam_tonkAI : public ScriptedAI
{
- npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() OVERRIDE {}
void EnterCombat(Unit* /*who*/) OVERRIDE {}
@@ -1710,11 +1710,11 @@ enum WormholeSpells
class npc_wormhole : public CreatureScript
{
public:
- npc_wormhole() : CreatureScript("npc_wormhole") {}
+ npc_wormhole() : CreatureScript("npc_wormhole") { }
struct npc_wormholeAI : public PassiveAI
{
- npc_wormholeAI(Creature* creature) : PassiveAI(creature) {}
+ npc_wormholeAI(Creature* creature) : PassiveAI(creature) { }
void InitializeAI() OVERRIDE
{
@@ -2129,7 +2129,7 @@ public:
struct npc_fireworkAI : public ScriptedAI
{
- npc_fireworkAI(Creature* creature) : ScriptedAI(creature) {}
+ npc_fireworkAI(Creature* creature) : ScriptedAI(creature) { }
bool isCluster()
{