aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-05-26 23:31:46 +0200
committerShauren <shauren.trinity@gmail.com>2011-05-26 23:31:46 +0200
commita644206f88601119c74aeb49030a22f9ce39d421 (patch)
tree8e9bd133414f63cf072393053d7042f1e2adf441 /src/server/scripts/World
parent7abb302d8f9caf7adb109d7602896c185dea9095 (diff)
Scripts: Removed SEND_VENDORLIST and SEND_TRAINERLIST defines
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/npc_innkeeper.cpp2
-rw-r--r--src/server/scripts/World/npc_professions.cpp16
-rw-r--r--src/server/scripts/World/npcs_special.cpp8
3 files changed, 13 insertions, 13 deletions
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();