diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/zone_storm_peaks.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_professions.cpp | 97 |
2 files changed, 5 insertions, 94 deletions
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 2f68b9bef51..f4309481592 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -153,7 +153,7 @@ public: switch (action) { case GOSSIP_ACTION_TRAIN: - player->GetSession()->SendTrainerList(creature->GetGUID(), TRAINER_ID_ROXI_RAMROCKET); + player->GetSession()->SendTrainerList(creature, TRAINER_ID_ROXI_RAMROCKET); break; case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 26e4e6de928..715bf6fc9a0 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -489,7 +489,7 @@ public: player->GetSession()->SendListInventory(creature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - player->GetSession()->SendTrainerList(creature->GetGUID(), TRAINER_ID_ALCHEMY); + player->GetSession()->SendTrainerList(creature, TRAINER_ID_ALCHEMY); break; //Learn Alchemy case GOSSIP_ACTION_INFO_DEF + 1: @@ -677,7 +677,7 @@ public: player->GetSession()->SendListInventory(creature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - player->GetSession()->SendTrainerList(creature->GetGUID(), TRAINER_ID_BLACKSMITHING); + player->GetSession()->SendTrainerList(creature, TRAINER_ID_BLACKSMITHING); break; //Learn Armor/Weapon case GOSSIP_ACTION_INFO_DEF + 1: @@ -987,7 +987,7 @@ public: player->GetSession()->SendListInventory(creature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - player->GetSession()->SendTrainerList(creature->GetGUID(), TRAINER_ID_LEATHERWORKING); + player->GetSession()->SendTrainerList(creature, TRAINER_ID_LEATHERWORKING); break; //Unlearn Leather case GOSSIP_ACTION_INFO_DEF + 1: @@ -1117,7 +1117,7 @@ public: player->GetSession()->SendListInventory(creature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - player->GetSession()->SendTrainerList(creature->GetGUID(), TRAINER_ID_TAILORING); + player->GetSession()->SendTrainerList(creature, TRAINER_ID_TAILORING); break; //Learn Tailor case GOSSIP_ACTION_INFO_DEF + 1: @@ -1245,94 +1245,6 @@ enum MultiProfessionTrainer GOSSIP_MENU_TAILORING = 12199 }; -/*### -# start menu multi profession trainer -###*/ - -class npc_multi_profession_trainer : public CreatureScript -{ -public: - npc_multi_profession_trainer() : CreatureScript("npc_multi_profession_trainer") { } - - struct npc_multi_profession_trainerAI : public ScriptedAI - { - npc_multi_profession_trainerAI(Creature* creature) : ScriptedAI(creature) { } - - void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) - { - switch (gossipListId) - { - case GOSSIP_OPTION_ALCHEMY: - case GOSSIP_OPTION_BLACKSMITHING: - case GOSSIP_OPTION_ENCHANTING: - case GOSSIP_OPTION_ENGINEERING: - case GOSSIP_OPTION_HERBALISM: - case GOSSIP_OPTION_INSCRIPTION: - case GOSSIP_OPTION_JEWELCRAFTING: - case GOSSIP_OPTION_LEATHERWORKING: - case GOSSIP_OPTION_MINING: - case GOSSIP_OPTION_SKINNING: - case GOSSIP_OPTION_TAILORING: - SendTrainerList(player, gossipListId); - break; - case GOSSIP_OPTION_MULTI: - { - switch (menuId) - { - case GOSSIP_MENU_HERBALISM: - SendTrainerList(player, GOSSIP_OPTION_HERBALISM); - break; - case GOSSIP_MENU_MINING: - SendTrainerList(player, GOSSIP_OPTION_MINING); - break; - case GOSSIP_MENU_SKINNING: - SendTrainerList(player, GOSSIP_OPTION_SKINNING); - break; - case GOSSIP_MENU_ALCHEMY: - SendTrainerList(player, GOSSIP_OPTION_ALCHEMY); - break; - case GOSSIP_MENU_BLACKSMITHING: - SendTrainerList(player, GOSSIP_OPTION_BLACKSMITHING); - break; - case GOSSIP_MENU_ENCHANTING: - SendTrainerList(player, GOSSIP_OPTION_ENCHANTING); - break; - case GOSSIP_MENU_ENGINEERING: - SendTrainerList(player, GOSSIP_OPTION_ENGINEERING); - break; - case GOSSIP_MENU_INSCRIPTION: - SendTrainerList(player, GOSSIP_OPTION_INSCRIPTION); - break; - case GOSSIP_MENU_JEWELCRAFTING: - SendTrainerList(player, GOSSIP_OPTION_JEWELCRAFTING); - break; - case GOSSIP_MENU_LEATHERWORKING: - SendTrainerList(player, GOSSIP_OPTION_LEATHERWORKING); - break; - case GOSSIP_MENU_TAILORING: - SendTrainerList(player, GOSSIP_OPTION_TAILORING); - break; - default: - break; - } - } - default: - break; - } - } - - void SendTrainerList(Player* player, uint32 Index) - { - player->GetSession()->SendTrainerList(me->GetGUID(), Index + 1); - } - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_multi_profession_trainerAI(creature); - } -}; - void AddSC_npc_professions() { new npc_prof_alchemy(); @@ -1340,5 +1252,4 @@ void AddSC_npc_professions() new npc_engineering_tele_trinket(); new npc_prof_leather(); new npc_prof_tailor(); - new npc_multi_profession_trainer(); } |