josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts: Removed SEND_VENDORLIST and SEND_TRAINERLIST defines

Browse Source
This commit is contained in:
Shauren
2011-05-26 23:31:46 +02:00
parent 7abb302d8f
commit a644206f88
21 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/ScriptedAI/ScriptedGossip.h
-4
View File
@@ -88,8 +88,4 @@ enum eTradeskill
// Closes the Menu // Closes the Menu
#define CLOSE_GOSSIP_MENU() PlayerTalkClass->CloseGossip() #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 #endif
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+1 -1
View File
@@ -574,7 +574,7 @@ public:
pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false);
} }
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/ghostlands.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+1 -1
View File
@@ -381,7 +381,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/feralas.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
pPlayer->SEND_GOSSIP_MENU(2434, pCreature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2434, pCreature->GetGUID());
} }
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/tanaris.cpp
+1 -1
View File
@@ -248,7 +248,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Kalimdor/winterspring.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Northrend/borean_tundra.cpp
+1 -1
View File
@@ -2559,7 +2559,7 @@ public:
} }
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Northrend/dalaran.cpp
+2 -2
View File
@@ -149,10 +149,10 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRAIN) if (uiAction == GOSSIP_ACTION_TRAIN)
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Northrend/icecrown.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
}; };
src/server/scripts/Northrend/storm_peaks.cpp
+2 -2
View File
@@ -524,10 +524,10 @@ public:
switch(action) switch(action)
{ {
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
} }
return true; return true;
src/server/scripts/Outland/hellfire_peninsula.cpp
+1 -1
View File
@@ -287,7 +287,7 @@ public:
pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
} }
src/server/scripts/Outland/shadowmoon_valley.cpp
+2 -2
View File
@@ -417,7 +417,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
@@ -578,7 +578,7 @@ public:
switch (uiAction) switch (uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
src/server/scripts/Outland/shattrath_city.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Outland/terokkar_forest.cpp
+1 -1
View File
@@ -610,7 +610,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
src/server/scripts/Outland/zangarmarsh.cpp
+2 -4
View File
@@ -288,9 +288,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
{ pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
}
return true; return true;
} }
}; };
@@ -415,7 +413,7 @@ public:
pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, pCreature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
} }
src/server/scripts/World/npc_innkeeper.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ public:
switch (uiAction) 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; case GOSSIP_ACTION_INN: pPlayer->SetBindPoint(pCreature->GetGUID()); break;
} }
return true; return true;
src/server/scripts/World/npc_professions.cpp
+8 -8
View File
@@ -401,10 +401,10 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
break; break;
//Learn Alchemy //Learn Alchemy
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
@@ -616,10 +616,10 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
break; break;
//Learn Armor/Weapon //Learn Armor/Weapon
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
@@ -996,10 +996,10 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
break; break;
//Unlearn Leather //Unlearn Leather
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
@@ -1153,10 +1153,10 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
break; break;
//Learn Tailor //Learn Tailor
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
src/server/scripts/World/npcs_special.cpp
+4 -4
View File
@@ -1250,7 +1250,7 @@ public:
{ {
pPlayer->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_TRADE) if (uiAction == GOSSIP_ACTION_TRADE)
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
@@ -1303,7 +1303,7 @@ public:
pPlayer->CastSpell(pPlayer, 21100, false); pPlayer->CastSpell(pPlayer, 21100, false);
break; break;
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendTrainerList(pCreature->GetGUID());
break; break;
case GOSSIP_OPTION_UNLEARNTALENTS: case GOSSIP_OPTION_UNLEARNTALENTS:
pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
@@ -2494,7 +2494,7 @@ public:
pPlayer->SEND_GOSSIP_MENU(13583, pCreature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(13583, pCreature->GetGUID());
} }
else else
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
return true; return true;
} }
@@ -2505,7 +2505,7 @@ public:
switch(uiAction) switch(uiAction)
{ {
case GOSSIP_ACTION_TRADE: case GOSSIP_ACTION_TRADE:
pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); pPlayer->GetSession()->SendListInventory(pCreature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();