diff options
| author | Spp <spp@jorge.gr> | 2012-12-19 08:23:34 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-12-19 08:23:34 +0100 |
| commit | 80b1b6c4940a43fa0db175097a54d6cb50e7b15c (patch) | |
| tree | ab3c1f0d7ea2df6fb563e3af7e205fcc84baacda /src/server/scripts/EasternKingdoms | |
| parent | a227a3494766103cf6805cf52839612854c2767b (diff) | |
| parent | a2832805afb9a8a3434172479c814ca2a729ece1 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/moonglade.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 73fefe210df..4a08801c972 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -32,10 +32,11 @@ enum Midnight SAY_MIDNIGHT_KILL = 0, SAY_APPEAR = 1, SAY_MOUNT = 2, - SAY_KILL = 3, - SAY_DISARMED = 4, - SAY_DEATH = 5, - SAY_RANDOM = 6, + + SAY_KILL = 0, + SAY_DISARMED = 1, + SAY_DEATH = 2, + SAY_RANDOM = 3, SPELL_SHADOWCLEAVE = 29832, SPELL_INTANGIBLE_PRESENCE = 29833, |