diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 01:16:53 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 01:24:21 +0100 |
| commit | 24b5dfcb4dd3a8bfd08562db8d9c1590529ed457 (patch) | |
| tree | eb1f31b7681cd1cf797b690c1580f0e012afadce /src/server/game/Miscellaneous/Language.h | |
| parent | 5fe819462f30d6564f592e628c0828efd73689ef (diff) | |
Core/BattlegroundIC: Removed 1 hack:
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."
(cherry picked from commit 8a4afad63ac97b39f6746d466f3166eeef62e711)
Conflicts:
sql/updates/world/2015_05_01_00_world.sql
src/server/game/Miscellaneous/Language.h
Rename 2015_05_01_00_world.sql to 2015_06_13_00_world.sql
(cherry picked from commit 74eeefa5be163a55489f91c05d7dfd1cb624c78d)
Diffstat (limited to 'src/server/game/Miscellaneous/Language.h')
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 9bae8fbdfae..63390ad61da 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -971,15 +971,15 @@ enum TrinityStrings LANG_GUILD_INFO_BANK_GOLD = 1181, LANG_GUILD_INFO_MOTD = 1182, LANG_GUILD_INFO_EXTRA_INFO = 1183, - // Room for more level 3 1184-1199 not used + // Room for more level 3 1184-1198 not used // Debug commands + LANG_DO_NOT_USE_6X_DEBUG_AREATRIGGER_LEFT = 1999, LANG_CINEMATIC_NOT_EXIST = 1200, LANG_MOVIE_NOT_EXIST = 1201, LANG_DEBUG_AREATRIGGER_ON = 1202, LANG_DEBUG_AREATRIGGER_OFF = 1203, LANG_DEBUG_AREATRIGGER_REACHED = 1204, - // Room for more debug 1205-1299 not used // Isle of Conquest LANG_BG_IC_START_TWO_MINUTES = 1205, |