diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-08 01:21:17 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-08 01:21:17 +0200 |
| commit | 73e90f62411a4f507ae210ab20f78ce81af13b93 (patch) | |
| tree | a4ab0fa6845ef84bd885da0b963395f67415093e /src/server/scripts/EasternKingdoms | |
| parent | f53045ae5c880ff5fbb75cfe0bd51bb5bbade655 (diff) | |
| parent | 27b5e0d9ac20f7bc1a061e22ae923483bcf4f8db (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp index 1a2e8bba805..894b528c03c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -50,7 +50,7 @@ class boss_anubshiah : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOWBOLT, 7000); _events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 24000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index 79ffedc8c17..d5b8d1deadd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -54,7 +54,7 @@ class boss_general_angerforge : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void EnterCombat(Unit* /*who*/) override { _events.SetPhase(PHASE_ONE); _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp index f46c0c118b1..f53fd0f65b3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp @@ -51,7 +51,7 @@ class boss_grizzle : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void EnterCombat(Unit* /*who*/) override { _events.SetPhase(PHASE_ONE); _events.ScheduleEvent(EVENT_GROUNDTREMOR, 12000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 7105d78f2ee..c41ddf9d98b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -48,7 +48,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4000); _events.ScheduleEvent(EVENT_MANABURN, 14000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index efc9a6e793b..e6bbbaa73a9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -51,7 +51,7 @@ class boss_magmus : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void EnterCombat(Unit* /*who*/) override { _events.SetPhase(PHASE_ONE); _events.ScheduleEvent(EVENT_FIERY_BURST, 5000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index 0c36fe9696d..8342bef682b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -50,7 +50,7 @@ class boss_moira_bronzebeard : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void EnterCombat(Unit* /*who*/) override { //_events.ScheduleEvent(EVENT_HEAL, 12000); // not used atm // These times are probably wrong _events.ScheduleEvent(EVENT_MINDBLAST, 16000); |