diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-01-05 23:36:57 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-03-21 23:21:18 +0100 |
| commit | 40ea130f5a7105fe48c5757dfb586413710db78d (patch) | |
| tree | 9ff1fe4eafaae37290aa175e685f2fbce92d000d /src | |
| parent | c9fdb6af59d05a4ea2ada9fe1e16156bdc6359f0 (diff) | |
Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-base
(cherry picked from commit 1d9d03b2891b5481eff6541a8563599ccc60c48d)
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 29b3aa2e4df..32742105d17 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -36,7 +36,6 @@ EndScriptData #define GOSSIP_DABIREE1 "Fly me to Murketh and Shaadraz Gateways" #define GOSSIP_DABIREE2 "Fly me to Shatter Point" #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>" class npc_taxi : public CreatureScript @@ -76,10 +75,6 @@ public: if (player->GetQuestStatus(10652) != QUEST_STATUS_REWARDED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VERONIA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); break; - case 23415: // Terokkar Forest - Skyguard Handler Deesak - if (player->GetReputationRank(1031) >= REP_HONORED) - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEESAK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16); - break; case 23704: // Dustwallow Marsh - Cassa Crimsonwing if (player->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25); @@ -125,10 +120,6 @@ public: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player, 34905, true); //TaxiPath 606 break; - case GOSSIP_ACTION_INFO_DEF + 16: - player->CLOSE_GOSSIP_MENU(); - player->CastSpell(player, 41279, true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost) - break; case GOSSIP_ACTION_INFO_DEF + 25: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player, 42295, true); |