diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2019-06-05 21:43:55 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-10 22:45:42 +0100 |
| commit | 41dba7c4560b9cd11ed0648823124c1c89e3ed3e (patch) | |
| tree | 7afbbf040589585ce95c5d2d2215299f188e4abd | |
| parent | 31747b4f8681636e5cb0e8fde62af57dca87b624 (diff) | |
Scripts/ZulGurub: general instance related refactoring/updating
plus couple event-spells-ai related corrections
plus codestyle cleanup
(cherry picked from commit 7b2defe5a0e645ab88e48df2d8e5417e4977d41c)
7 files changed, 14 insertions, 18 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 55e42b63cd5..a4e7bf5b422 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -15,10 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "zulgurub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 52580b16cf7..7ecb75d6899 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -15,10 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "zulgurub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 3ed80c338e5..10b2f60e1c2 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -15,16 +15,16 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" +#include "zulgurub.h" #include "GridNotifiers.h" #include "InstanceScript.h" #include "ObjectAccessor.h" #include "MotionMaster.h" #include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "zulgurub.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index edc02e8d66f..6873520c500 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -15,10 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "zulgurub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index bbc30e74f75..8fbcf3bb322 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -15,11 +15,11 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "zulgurub.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "Spell.h" -#include "zulgurub.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 0e363f39efa..dc8cc00808d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -15,10 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "zulgurub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 4dfb3a9e2d2..60a7eff4b1f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" +#include "zulgurub.h" #include "Creature.h" #include "InstanceScript.h" -#include "zulgurub.h" +#include "ScriptMgr.h" DoorData const doorData[] = { |