From c45fe6969c33e3eaf8662cfcc79c63e4071cdb7c Mon Sep 17 00:00:00 2001 From: Blaymoira Date: Sat, 14 Mar 2009 11:49:16 +0100 Subject: [PATCH] *Remove not needed code --HG-- branch : trunk --- sql/updates/1884_world.sql | 1 + sql/updates/CMakeLists.txt | 1 + src/game/Language.h | 6 +----- src/game/Player.cpp | 13 ------------- 4 files changed, 3 insertions(+), 18 deletions(-) create mode 100644 sql/updates/1884_world.sql diff --git a/sql/updates/1884_world.sql b/sql/updates/1884_world.sql new file mode 100644 index 0000000000..e2d1ed8c46 --- /dev/null +++ b/sql/updates/1884_world.sql @@ -0,0 +1 @@ +DELETE FROM trinity_string WHERE entry in (10056, 10057); \ No newline at end of file diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 805d49d7fd..dc5d2c1f55 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -80,4 +80,5 @@ INSTALL(FILES 1828_world.sql 1857_world.sql 1881_world.sql +1884_world.sql DESTINATION share/trinity/sql/updates) \ No newline at end of file diff --git a/src/game/Language.h b/src/game/Language.h index 4662017110..c2694a9909 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -907,11 +907,7 @@ enum TrinityStrings LANG_OPVP_EP_FLIGHT_CGT = 10053, LANG_OPVP_ZM_GOSSIP_ALLIANCE = 10054, LANG_OPVP_ZM_GOSSIP_HORDE = 10055, - LANG_NO_ENTER_HALL_OF_LEGENDS = 10056, - LANG_NO_ENTER_CHAMPIONS_HALL = 10057, - - - + // Use for custom patches 11000-11999 // NOT RESERVED IDS 12000-1999999999 diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 064e4db969..68bb562888 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1625,19 +1625,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati if(!InBattleGround() && mEntry->IsBattleGroundOrArena()) return false; - // 449 - Champions' Hall (Alliance) // 450 - Hall of Legends (Horde) - if(mapid == 449 && GetTeam()==HORDE) - { - GetSession()->SendNotification(LANG_NO_ENTER_CHAMPIONS_HALL); - return false; - } - - if(mapid == 450 && GetTeam() == ALLIANCE) - { - GetSession()->SendNotification(LANG_NO_ENTER_HALL_OF_LEGENDS); - return false; - } - // client without expansion support if(GetSession()->Expansion() < mEntry->Expansion()) {