diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
| commit | 24e0eb1812f94c5092009f78ced3306f142d2789 (patch) | |
| tree | 0118c5abc4e0bb3e8e2a218ca2c9c1934f8eb0d1 /src/server/scripts/Northrend | |
| parent | 8db66bfefdb9ec7a722dd93aadbbd818c567fba0 (diff) | |
| parent | 7dd0cd4403d7f28343a751e7b85aeb30d3968ff5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 25daff60761..952363c6dcf 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -153,13 +153,13 @@ enum Texts SAY_KILLED_PLAYER_P_THREE = 12, SAY_SPELL_CASTING_P_THREE = 13, SAY_DEATH, - + // Alexstrasza SAY_ONE = 0, SAY_TWO = 1, SAY_THREE = 2, SAY_FOUR = 3, - + // Power Sparks EMOTE_POWER_SPARK_SUMMONED = 0 }; |