diff options
21 files changed, 34 insertions, 40 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h index 59943fa2c9c..20616133016 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h @@ -88,8 +88,4 @@ enum eTradeskill // Closes the Menu #define CLOSE_GOSSIP_MENU() PlayerTalkClass->CloseGossip() -// Fuctions to send NPC lists, a - is always the npc guid(uint64) -#define SEND_VENDORLIST(a) GetSession()->SendListInventory(a) -#define SEND_TRAINERLIST(a) GetSession()->SendTrainerList(a) - #endif diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 58480e9d4d3..9b891940376 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -574,7 +574,7 @@ public: pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); } if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index 4a41c325633..2d9f6ab9cc0 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -76,7 +76,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 31a574ccef8..6c527275864 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -121,7 +121,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 6534fd4d0e9..76ef5be0561 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -55,7 +55,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 1047eba6bc0..ac29aec35e4 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -381,7 +381,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index e7140cc1325..1da5b2e57c5 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -46,7 +46,7 @@ public: pPlayer->SEND_GOSSIP_MENU(2434, pCreature->GetGUID()); } if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index c3937ddc95e..8671b51c9e8 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -248,7 +248,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp index fb245d5c97d..7650c20a0a2 100644 --- a/src/server/scripts/Kalimdor/winterspring.cpp +++ b/src/server/scripts/Kalimdor/winterspring.cpp @@ -109,7 +109,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 73a2e4ac203..6f4dcd50571 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -2559,7 +2559,7 @@ public: } if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index c01d348e572..13dc395712a 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -149,10 +149,10 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRAIN) - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 6075bc52d25..6d6cf8998c0 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -141,7 +141,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } }; diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 3f6003e8903..156ee5eb67b 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -524,10 +524,10 @@ public: switch(action) { case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; } return true; diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 496e813a3a4..8a0a6fd4478 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -287,7 +287,7 @@ public: pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; } diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index c705a159d9b..8eda56d77e1 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -417,7 +417,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } @@ -578,7 +578,7 @@ public: switch (uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 12ac3ea777e..7255a7432e9 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -210,7 +210,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 6a934362b2b..0bf7e99ad80 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -610,7 +610,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index b8c2aa34a0a..32095a26140 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -288,9 +288,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - { - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); - } + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } }; @@ -415,7 +413,7 @@ public: pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, pCreature->GetGUID()); break; case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; } diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 1bf6196a66a..e0726035e5b 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -118,7 +118,7 @@ public: switch (uiAction) { - case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); break; + case GOSSIP_ACTION_TRADE: pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_INN: pPlayer->SetBindPoint(pCreature->GetGUID()); break; } return true; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 1ca5fb54234..bf711f97016 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -401,10 +401,10 @@ public: switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); break; //Learn Alchemy case GOSSIP_ACTION_INFO_DEF + 1: @@ -616,10 +616,10 @@ public: switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); break; //Learn Armor/Weapon case GOSSIP_ACTION_INFO_DEF + 1: @@ -996,10 +996,10 @@ public: switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); break; //Unlearn Leather case GOSSIP_ACTION_INFO_DEF + 1: @@ -1153,10 +1153,10 @@ public: switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); break; //Learn Tailor case GOSSIP_ACTION_INFO_DEF + 1: diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index c34d20a29b1..68157202776 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1250,7 +1250,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } @@ -1303,7 +1303,7 @@ public: pPlayer->CastSpell(pPlayer, 21100, false); break; case GOSSIP_ACTION_TRAIN: - pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID()); break; case GOSSIP_OPTION_UNLEARNTALENTS: pPlayer->CLOSE_GOSSIP_MENU(); @@ -2494,7 +2494,7 @@ public: pPlayer->SEND_GOSSIP_MENU(13583, pCreature->GetGUID()); } else - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); return true; } @@ -2505,7 +2505,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + pPlayer->GetSession()->SendListInventory(pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); |