aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorMalcrom <malcromdev@gmail.com>2013-01-07 22:48:40 -0330
committerMalcrom <malcromdev@gmail.com>2013-01-07 22:48:40 -0330
commit43d73bebd081f52b05f360886653ece9a17fb9c9 (patch)
treeb2d8b1318a8510e941860f0194dcff7de4395317 /src/server/scripts/Kalimdor
parent2a9fc5198b69157a048101b7bf234492bd870260 (diff)
Core/Scripting: Some cleanup
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp4
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp6
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp14
3 files changed, 13 insertions, 11 deletions
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 43b647ff962..4724794d03b 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -42,7 +42,7 @@ enum Yells
SAY_PHASE_3_TRANS = 3,
// Emote
- EMOTE_BREATH = 4,
+ EMOTE_BREATH = 4
};
enum Spells
@@ -72,7 +72,7 @@ enum Spells
//SPELL_BREATH = 21131, // 8x in "array", different initial cast than the other arrays
// Phase 3 spells
- SPELL_BELLOWING_ROAR = 18431,
+ SPELL_BELLOWING_ROAR = 18431
};
struct OnyxMove
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index b471c207868..fcb6364244e 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -29,7 +29,7 @@ enum Texts
SAY_INTRO = 1,
SAY_AGGRO = 2,
SAY_SLAY = 3,
- SAY_DEATH = 4,
+ SAY_DEATH = 4
};
enum Spells
@@ -40,12 +40,12 @@ enum Spells
SPELL_SUPREME = 25176,
SPELL_SUMMON = 20477,
SPELL_SAND_STORM = 25160,
- SPELL_SUMMON_CRYSTAL = 25192,
+ SPELL_SUMMON_CRYSTAL = 25192
};
enum Actions
{
- ACTION_TRIGGER_WEAKNESS = 1,
+ ACTION_TRIGGER_WEAKNESS = 1
};
enum Events
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 39b005db541..53242d4cdc6 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -27,12 +27,14 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "temple_of_ahnqiraj.h"
-#define SPELL_SWEEP 26103
-#define SPELL_SANDBLAST 26102
-#define SPELL_GROUND_RUPTURE 26100
-#define SPELL_BIRTH 26262 //The Birth Animation
-
-#define SPELL_DIRTMOUND_PASSIVE 26092
+enum Spells
+{
+ SPELL_SWEEP = 26103,
+ SPELL_SANDBLAST = 26102,
+ SPELL_GROUND_RUPTURE = 26100,
+ SPELL_BIRTH = 26262, // The Birth Animation
+ SPELL_DIRTMOUND_PASSIVE = 26092
+};
class boss_ouro : public CreatureScript
{