diff options
author | treeston <treeston.mmoc@gmail.com> | 2016-01-05 23:36:26 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-03-21 23:20:26 +0100 |
commit | c9fdb6af59d05a4ea2ada9fe1e16156bdc6359f0 (patch) | |
tree | bc15b245627a85697803fe8322fd8add520c4ab0 /src | |
parent | 8225fb09c2ff0c84f52ea6b31586cfd41ba1d858 (diff) |
Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base
(cherry picked from commit c7459327b2c8565e7cb101826f5059e3cf0628c4)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/World/npc_taxi.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index f107a700fea..29b3aa2e4df 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -35,7 +35,6 @@ EndScriptData #define GOSSIP_BRAZEN "I am ready to go to Durnholde Keep." #define GOSSIP_DABIREE1 "Fly me to Murketh and Shaadraz Gateways" #define GOSSIP_DABIREE2 "Fly me to Shatter Point" -#define GOSSIP_IRENA "Fly me to Skettis please" #define GOSSIP_VERONIA "Fly me to Manaforge Coruu please" #define GOSSIP_DEESAK "Fly me to Ogri'la please" #define GOSSIP_CRIMSONWING "<Ride the gryphons to Survey Alcaz Island>" @@ -72,10 +71,6 @@ public: if (!player->GetQuestRewardStatus(10340)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DABIREE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); break; - case 23413: // Blade's Edge Mountains - Skyguard Handler Irena - if (player->GetReputationRank(1031) >= REP_HONORED) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_IRENA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); - break; case 20162: // Netherstorm - Veronia //Behind Enemy Lines if (player->GetQuestStatus(10652) != QUEST_STATUS_REWARDED) @@ -126,10 +121,6 @@ public: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player, 35069, true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point) break; - case GOSSIP_ACTION_INFO_DEF + 11: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, 41278, true); //TaxiPath 706 - break; case GOSSIP_ACTION_INFO_DEF + 15: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player, 34905, true); //TaxiPath 606 |