diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-07-27 00:04:37 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-07-27 00:04:37 +0200 |
| commit | b85d46138bf6cd0fd50a0f8060f1512002ced731 (patch) | |
| tree | 0f9785a0641b1978e45d507d2aae1e18b63bcef6 /src/server/scripts/Northrend | |
| parent | 0cd5179726f91cc163910dd0806d622fe86d9a8c (diff) | |
Core/Creatures: Deleted obsolete pet trainer script and fixed build
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/zone_storm_peaks.cpp | 9 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_wintergrasp.cpp | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 2c26c7b242d..2f68b9bef51 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -119,7 +119,8 @@ public: enum RoxiRamrocket { SPELL_MECHANO_HOG = 60866, - SPELL_MEKGINEERS_CHOPPER = 60867 + SPELL_MEKGINEERS_CHOPPER = 60867, + TRAINER_ID_ROXI_RAMROCKET = 102, }; class npc_roxi_ramrocket : public CreatureScript @@ -134,11 +135,11 @@ public: player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if ( creature->IsTrainer() ) + if (creature->IsTrainer()) AddGossipItemFor(player, GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if ( creature->IsVendor() ) + if (creature->IsVendor()) if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) AddGossipItemFor(player, GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -152,7 +153,7 @@ public: switch (action) { case GOSSIP_ACTION_TRAIN: - player->GetSession()->SendTrainerList(creature->GetGUID()); + player->GetSession()->SendTrainerList(creature->GetGUID(), TRAINER_ID_ROXI_RAMROCKET); break; case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index b06ab39d9f6..d31344add7b 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -396,10 +396,7 @@ class npc_wg_quest_giver : public CreatureScript return true; if (creature->IsVendor()) - { AddGossipItemFor(player, Player::GetDefaultGossipMenuForSource(creature), 0, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_VENDOR); - player->PlayerTalkClass->GetGossipMenu().AddGossipMenuItemData(0, 0, 0); - } /// @todo: move this to conditions or something else |