diff options
| author | Blaymoira <none@none> | 2009-03-14 11:49:16 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-14 11:49:16 +0100 |
| commit | c45fe6969c33e3eaf8662cfcc79c63e4071cdb7c (patch) | |
| tree | 7d0031e463169e506ae2f1b61f749273bbaf1f91 | |
| parent | b7f6495d2a4f8148393196b255e572bc562f629f (diff) | |
*Remove not needed code
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/1884_world.sql | 1 | ||||
| -rw-r--r-- | sql/updates/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/game/Language.h | 6 | ||||
| -rw-r--r-- | src/game/Player.cpp | 13 |
4 files changed, 3 insertions, 18 deletions
diff --git a/sql/updates/1884_world.sql b/sql/updates/1884_world.sql new file mode 100644 index 00000000000..e2d1ed8c461 --- /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 805d49d7fdf..dc5d2c1f557 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 4662017110e..c2694a9909a 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 064e4db969e..68bb5628887 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()) { |