diff options
| author | Malcrom <malcromdev@gmail.com> | 2013-01-07 22:48:40 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2013-01-07 22:48:40 -0330 |
| commit | 43d73bebd081f52b05f360886653ece9a17fb9c9 (patch) | |
| tree | b2d8b1318a8510e941860f0194dcff7de4395317 /src/server/scripts/EasternKingdoms | |
| parent | 2a9fc5198b69157a048101b7bf234492bd870260 (diff) | |
Core/Scripting: Some cleanup
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
3 files changed, 26 insertions, 17 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index aeb5f81a59e..ff68462ffb5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -25,7 +25,7 @@ enum Spells SPELL_BLASTWAVE = 11130, SPELL_SHOUT = 23511, SPELL_CLEAVE = 20691, - SPELL_KNOCKAWAY = 20686, + SPELL_KNOCKAWAY = 20686 }; enum Events @@ -33,14 +33,13 @@ enum Events EVENT_BLAST_WAVE = 1, EVENT_SHOUT = 2, EVENT_CLEAVE = 3, - EVENT_KNOCK_AWAY = 4, + EVENT_KNOCK_AWAY = 4 }; enum Adds { NPC_SPIRESTONE_WARLORD = 9216, - NPC_SMOLDERTHORN_BERSERKER = 9268, - + NPC_SMOLDERTHORN_BERSERKER = 9268 }; const Position SummonLocation1 = { -39.355f, -513.456f, 88.472f, 4.679f }; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index dd2d4ae85fa..75bdd2b06de 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -27,10 +27,13 @@ EndScriptData */ #include "ScriptedCreature.h" #include "stratholme.h" -#define SPELL_ENCASINGWEBS 4962 -#define SPELL_PIERCEARMOR 6016 -#define SPELL_CRYPT_SCARABS 31602 -#define SPELL_RAISEUNDEADSCARAB 17235 +enum Spells +{ + SPELL_ENCASINGWEBS = 4962, + SPELL_PIERCEARMOR = 6016, + SPELL_CRYPT_SCARABS = 31602, + SPELL_RAISEUNDEADSCARAB = 17235 +}; class boss_nerubenkan : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index 90e69f91aa6..a92d4778670 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -35,15 +35,22 @@ EndScriptData */ # Once Aurius is defeated, he should be the one summoning the ghosts. #####*/ -#define SH_GREGOR 17910 -#define SH_CATHELA 17911 -#define SH_NEMAS 17912 -#define SH_AELMAR 17913 -#define SH_VICAR 17914 -#define SH_QUEST_CREDIT 17915 - -#define SPELL_HOLY_LIGHT 25263 -#define SPELL_DIVINE_SHIELD 13874 +enum CreatureIds +{ + SH_GREGOR = 17910, + SH_CATHELA = 17911, + SH_NEMAS = 17912, + SH_AELMAR = 17913, + SH_VICAR = 17914, + SH_QUEST_CREDIT = 17915 +}; + +enum Spells +{ + SPELL_HOLY_LIGHT = 25263, + SPELL_DIVINE_SHIELD = 13874 +}; + class boss_silver_hand_bosses : public CreatureScript { public: |