pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove occurrences of _pkt

Browse Source
This commit is contained in:
Akkadius 2015-01-18 03:25:52 -06:00
parent b3bedef7af
commit 14bac9f8c0
8 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ucs/clientlist.cpp
View File

@ -323,7 +323,6 @@ static void ProcessMailTo(Client *c, std::string MailMessage) {
VARSTRUCT_ENCODE_TYPE(uint16, PacketBuffer, 0x3237); VARSTRUCT_ENCODE_TYPE(uint16, PacketBuffer, 0x3237);
VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x0); VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x0);
_pkt(UCS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
@ -344,7 +343,6 @@ static void ProcessMailTo(Client *c, std::string MailMessage) {
VARSTRUCT_ENCODE_STRING(PacketBuffer, "test"); // Doesn't matter what we send in this text field. VARSTRUCT_ENCODE_STRING(PacketBuffer, "test"); // Doesn't matter what we send in this text field.
VARSTRUCT_ENCODE_STRING(PacketBuffer, "1"); VARSTRUCT_ENCODE_STRING(PacketBuffer, "1");
_pkt(UCS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
@ -421,7 +419,6 @@ static void ProcessCommandBuddy(Client *c, std::string Buddy) {
database.RemoveFriendOrIgnore(c->GetCharID(), 1, Buddy.substr(1)); database.RemoveFriendOrIgnore(c->GetCharID(), 1, Buddy.substr(1));
} }
_pkt(UCS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -465,7 +462,6 @@ static void ProcessCommandIgnore(Client *c, std::string Ignoree) {
VARSTRUCT_ENCODE_STRING(PacketBuffer, Ignoree.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Ignoree.c_str());
_pkt(UCS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -626,7 +622,6 @@ void Clientlist::Process() {
while( KeyValid && !(*Iterator)->GetForceDisconnect() && while( KeyValid && !(*Iterator)->GetForceDisconnect() &&
(app = (EQApplicationPacket *)(*Iterator)->ClientStream->PopPacket())) { (app = (EQApplicationPacket *)(*Iterator)->ClientStream->PopPacket())) {
_pkt(UCS__PACKETS, app);
EmuOpcode opcode = app->GetOpcode(); EmuOpcode opcode = app->GetOpcode();
@ -943,7 +938,6 @@ void Client::SendMailBoxes() {
VARSTRUCT_ENCODE_STRING(PacketBuffer, s.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, s.c_str());
VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0); VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0);
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1087,7 +1081,6 @@ void Client::JoinChannels(std::string ChannelNameList) {
sprintf(PacketBuffer, "%s", JoinedChannelsList.c_str()); sprintf(PacketBuffer, "%s", JoinedChannelsList.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1104,7 +1097,6 @@ void Client::JoinChannels(std::string ChannelNameList) {
VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00); VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00);
VARSTRUCT_ENCODE_STRING(PacketBuffer, ChannelMessage.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, ChannelMessage.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1174,7 +1166,6 @@ void Client::LeaveChannels(std::string ChannelNameList) {
sprintf(PacketBuffer, "%s", JoinedChannelsList.c_str()); sprintf(PacketBuffer, "%s", JoinedChannelsList.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1191,7 +1182,6 @@ void Client::LeaveChannels(std::string ChannelNameList) {
VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00); VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00);
VARSTRUCT_ENCODE_STRING(PacketBuffer, ChannelMessage.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, ChannelMessage.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1275,7 +1265,6 @@ void Client::SendChannelList() {
VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00); VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00);
VARSTRUCT_ENCODE_STRING(PacketBuffer, ChannelMessage.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, ChannelMessage.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1516,7 +1505,6 @@ void Client::SendChannelMessage(std::string ChannelName, std::string Message, Cl
if(UnderfootOrLater) if(UnderfootOrLater)
VARSTRUCT_ENCODE_STRING(PacketBuffer, "SPAM:0:"); VARSTRUCT_ENCODE_STRING(PacketBuffer, "SPAM:0:");
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -1554,7 +1542,6 @@ void Client::AnnounceJoin(ChatChannel *Channel, Client *c) {
VARSTRUCT_ENCODE_STRING(PacketBuffer, Channel->GetName().c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Channel->GetName().c_str());
VARSTRUCT_ENCODE_STRING(PacketBuffer, c->GetName().c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, c->GetName().c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1574,7 +1561,6 @@ void Client::AnnounceLeave(ChatChannel *Channel, Client *c) {
VARSTRUCT_ENCODE_STRING(PacketBuffer, Channel->GetName().c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Channel->GetName().c_str());
VARSTRUCT_ENCODE_STRING(PacketBuffer, c->GetName().c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, c->GetName().c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -1599,7 +1585,6 @@ void Client::GeneralChannelMessage(std::string Message) {
VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00); VARSTRUCT_ENCODE_TYPE(uint8, PacketBuffer, 0x00);
VARSTRUCT_ENCODE_STRING(PacketBuffer, Message.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Message.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2290,7 +2275,6 @@ void Client::SendNotification(int MailBoxNumber, std::string Subject, std::strin
VARSTRUCT_ENCODE_STRING(PacketBuffer, From.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, From.c_str());
VARSTRUCT_ENCODE_STRING(PacketBuffer, Subject.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Subject.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -2311,7 +2295,6 @@ void Client::ChangeMailBox(int NewMailBox) {
VARSTRUCT_ENCODE_INTSTRING(buf, NewMailBox); VARSTRUCT_ENCODE_INTSTRING(buf, NewMailBox);
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -2340,7 +2323,6 @@ void Client::SendFriends() {
VARSTRUCT_ENCODE_STRING(PacketBuffer, (*Iterator).c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, (*Iterator).c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
@ -2363,7 +2345,6 @@ void Client::SendFriends() {
VARSTRUCT_ENCODE_STRING(PacketBuffer, Ignoree.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Ignoree.c_str());
_pkt(UCS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);

3
ucs/database.cpp
View File

@ -331,7 +331,6 @@ void Database::SendHeaders(Client *client) {
VARSTRUCT_ENCODE_INTSTRING(packetBuffer, unknownField3); VARSTRUCT_ENCODE_INTSTRING(packetBuffer, unknownField3);
VARSTRUCT_ENCODE_INTSTRING(packetBuffer, results.RowCount()); VARSTRUCT_ENCODE_INTSTRING(packetBuffer, results.RowCount());
_pkt(UCS__PACKETS, outapp);
client->QueuePacket(outapp); client->QueuePacket(outapp);
@ -369,7 +368,6 @@ void Database::SendHeaders(Client *client) {
VARSTRUCT_ENCODE_STRING(packetBuffer, row[2]); VARSTRUCT_ENCODE_STRING(packetBuffer, row[2]);
VARSTRUCT_ENCODE_STRING(packetBuffer, row[3]); VARSTRUCT_ENCODE_STRING(packetBuffer, row[3]);
_pkt(UCS__PACKETS, outapp);
client->QueuePacket(outapp); client->QueuePacket(outapp);
@ -419,7 +417,6 @@ void Database::SendBody(Client *client, int messageNumber) {
packetBuffer--; // Overwrite the null terminator packetBuffer--; // Overwrite the null terminator
VARSTRUCT_ENCODE_TYPE(uint8, packetBuffer, 0x0a); VARSTRUCT_ENCODE_TYPE(uint8, packetBuffer, 0x0a);
_pkt(UCS__PACKETS, outapp);
client->QueuePacket(outapp); client->QueuePacket(outapp);

3
world/client.cpp
View File

@ -916,7 +916,6 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
EmuOpcode opcode = app->GetOpcode(); EmuOpcode opcode = app->GetOpcode();
Log.Out(Logs::Detail, Logs::World_Server,"Recevied EQApplicationPacket"); Log.Out(Logs::Detail, Logs::World_Server,"Recevied EQApplicationPacket");
_pkt(WORLD__CLIENT_TRACE,app);
if (!eqs->CheckState(ESTABLISHED)) { if (!eqs->CheckState(ESTABLISHED)) {
Log.Out(Logs::Detail, Logs::World_Server,"Client disconnected (net inactive on send)"); Log.Out(Logs::Detail, Logs::World_Server,"Client disconnected (net inactive on send)");
@ -1006,7 +1005,6 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
default: default:
{ {
Log.Out(Logs::Detail, Logs::World_Server,"Received unknown EQApplicationPacket"); Log.Out(Logs::Detail, Logs::World_Server,"Received unknown EQApplicationPacket");
_pkt(WORLD__CLIENT_ERR,app);
return true; return true;
} }
} }
@ -1257,7 +1255,6 @@ bool Client::GenPassKey(char* key) {
void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req) { void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req) {
Log.Out(Logs::Detail, Logs::World_Server, "Sending EQApplicationPacket OpCode 0x%04x",app->GetOpcode()); Log.Out(Logs::Detail, Logs::World_Server, "Sending EQApplicationPacket OpCode 0x%04x",app->GetOpcode());
_pkt(WORLD__CLIENT_TRACE, app);
ack_req = true; // It's broke right now, dont delete this line till fix it. =P ack_req = true; // It's broke right now, dont delete this line till fix it. =P
eqs->QueuePacket(app, ack_req); eqs->QueuePacket(app, ack_req);

18
zone/client_packet.cpp
View File

@ -3436,7 +3436,6 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
// //
uint32 Action = VARSTRUCT_DECODE_TYPE(uint32, Buf); uint32 Action = VARSTRUCT_DECODE_TYPE(uint32, Buf);
_pkt(TRADING__BARTER, app);
switch (Action) switch (Action)
{ {
@ -3606,7 +3605,6 @@ void Client::Handle_OP_BazaarInspect(const EQApplicationPacket *app)
void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app) void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app)
{ {
_pkt(TRADING__PACKETS, app);
if (app->size == sizeof(BazaarSearch_Struct)) { if (app->size == sizeof(BazaarSearch_Struct)) {
@ -9798,7 +9796,6 @@ void Client::Handle_OP_OpenContainer(const EQApplicationPacket *app)
void Client::Handle_OP_OpenGuildTributeMaster(const EQApplicationPacket *app) void Client::Handle_OP_OpenGuildTributeMaster(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_OpenGuildTributeMaster of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_OpenGuildTributeMaster of length %d", app->size);
_pkt(TRIBUTE__IN, app);
if (app->size != sizeof(StartTribute_Struct)) if (app->size != sizeof(StartTribute_Struct))
printf("Error in OP_OpenGuildTributeMaster. Expected size of: %zu, but got: %i\n", sizeof(StartTribute_Struct), app->size); printf("Error in OP_OpenGuildTributeMaster. Expected size of: %zu, but got: %i\n", sizeof(StartTribute_Struct), app->size);
@ -9830,7 +9827,6 @@ void Client::Handle_OP_OpenInventory(const EQApplicationPacket *app)
void Client::Handle_OP_OpenTributeMaster(const EQApplicationPacket *app) void Client::Handle_OP_OpenTributeMaster(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_OpenTributeMaster of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_OpenTributeMaster of length %d", app->size);
_pkt(TRIBUTE__IN, app);
if (app->size != sizeof(StartTribute_Struct)) if (app->size != sizeof(StartTribute_Struct))
printf("Error in OP_OpenTributeMaster. Expected size of: %zu, but got: %i\n", sizeof(StartTribute_Struct), app->size); printf("Error in OP_OpenTributeMaster. Expected size of: %zu, but got: %i\n", sizeof(StartTribute_Struct), app->size);
@ -11700,7 +11696,6 @@ void Client::Handle_OP_RezzAnswer(const EQApplicationPacket *app)
Log.Out(Logs::Detail, Logs::Spells, "Received OP_RezzAnswer from client. Pendingrezzexp is %i, action is %s", Log.Out(Logs::Detail, Logs::Spells, "Received OP_RezzAnswer from client. Pendingrezzexp is %i, action is %s",
PendingRezzXP, ra->action ? "ACCEPT" : "DECLINE"); PendingRezzXP, ra->action ? "ACCEPT" : "DECLINE");
_pkt(SPELLS__REZ, app);
OPRezzAnswer(ra->action, ra->spellid, ra->zone_id, ra->instance_id, ra->x, ra->y, ra->z); OPRezzAnswer(ra->action, ra->spellid, ra->zone_id, ra->instance_id, ra->x, ra->y, ra->z);
@ -11766,7 +11761,6 @@ void Client::Handle_OP_SaveOnZoneReq(const EQApplicationPacket *app)
void Client::Handle_OP_SelectTribute(const EQApplicationPacket *app) void Client::Handle_OP_SelectTribute(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_SelectTribute of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_SelectTribute of length %d", app->size);
_pkt(TRIBUTE__IN, app);
//we should enforce being near a real tribute master to change this //we should enforce being near a real tribute master to change this
//but im not sure how I wanna do that right now. //but im not sure how I wanna do that right now.
@ -13391,7 +13385,6 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
// SoF sends 1 or more unhandled OP_Trader packets of size 96 when a trade has completed. // SoF sends 1 or more unhandled OP_Trader packets of size 96 when a trade has completed.
// I don't know what they are for (yet), but it doesn't seem to matter that we ignore them. // I don't know what they are for (yet), but it doesn't seem to matter that we ignore them.
_pkt(TRADING__PACKETS, app);
uint32 max_items = 80; uint32 max_items = 80;
@ -13498,7 +13491,6 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
TraderStatus_Struct* tss = (TraderStatus_Struct*)outapp->pBuffer; TraderStatus_Struct* tss = (TraderStatus_Struct*)outapp->pBuffer;
tss->Code = BazaarTrader_StartTraderMode2; tss->Code = BazaarTrader_StartTraderMode2;
QueuePacket(outapp); QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
} }
} }
@ -13539,7 +13531,6 @@ void Client::Handle_OP_TraderBuy(const EQApplicationPacket *app)
// //
// Client has elected to buy an item from a Trader // Client has elected to buy an item from a Trader
// //
_pkt(TRADING__PACKETS, app);
if (app->size == sizeof(TraderBuy_Struct)){ if (app->size == sizeof(TraderBuy_Struct)){
@ -13622,7 +13613,6 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
// This is when a potential purchaser right clicks on this client who is in Trader mode to // This is when a potential purchaser right clicks on this client who is in Trader mode to
// browse their goods. // browse their goods.
// //
_pkt(TRADING__PACKETS, app);
TraderClick_Struct* tcs = (TraderClick_Struct*)app->pBuffer; TraderClick_Struct* tcs = (TraderClick_Struct*)app->pBuffer;
@ -13653,7 +13643,6 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
QueuePacket(outapp); QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
if (outtcs->Approval) { if (outtcs->Approval) {
this->BulkSendTraderInventory(Customer->CharacterID()); this->BulkSendTraderInventory(Customer->CharacterID());
@ -13740,7 +13729,6 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
void Client::Handle_OP_TributeItem(const EQApplicationPacket *app) void Client::Handle_OP_TributeItem(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeItem of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeItem of length %d", app->size);
_pkt(TRIBUTE__IN, app);
//player donates an item... //player donates an item...
if (app->size != sizeof(TributeItem_Struct)) if (app->size != sizeof(TributeItem_Struct))
@ -13759,7 +13747,6 @@ void Client::Handle_OP_TributeItem(const EQApplicationPacket *app)
t->tribute_points = TributeItem(t->slot, t->quantity); t->tribute_points = TributeItem(t->slot, t->quantity);
Log.Out(Logs::Detail, Logs::Tribute, "Sending tribute item reply with %d points", t->tribute_points); Log.Out(Logs::Detail, Logs::Tribute, "Sending tribute item reply with %d points", t->tribute_points);
_pkt(TRIBUTE__OUT, app);
QueuePacket(app); QueuePacket(app);
} }
@ -13769,7 +13756,6 @@ void Client::Handle_OP_TributeItem(const EQApplicationPacket *app)
void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app) void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeMoney of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeMoney of length %d", app->size);
_pkt(TRIBUTE__IN, app);
//player donates money //player donates money
if (app->size != sizeof(TributeMoney_Struct)) if (app->size != sizeof(TributeMoney_Struct))
@ -13788,7 +13774,6 @@ void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app)
t->tribute_points = TributeMoney(t->platinum); t->tribute_points = TributeMoney(t->platinum);
Log.Out(Logs::Detail, Logs::Tribute, "Sending tribute money reply with %d points", t->tribute_points); Log.Out(Logs::Detail, Logs::Tribute, "Sending tribute money reply with %d points", t->tribute_points);
_pkt(TRIBUTE__OUT, app);
QueuePacket(app); QueuePacket(app);
} }
@ -13798,7 +13783,6 @@ void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app)
void Client::Handle_OP_TributeNPC(const EQApplicationPacket *app) void Client::Handle_OP_TributeNPC(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeNPC of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeNPC of length %d", app->size);
_pkt(TRIBUTE__IN, app);
return; return;
} }
@ -13806,7 +13790,6 @@ void Client::Handle_OP_TributeNPC(const EQApplicationPacket *app)
void Client::Handle_OP_TributeToggle(const EQApplicationPacket *app) void Client::Handle_OP_TributeToggle(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeToggle of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeToggle of length %d", app->size);
_pkt(TRIBUTE__IN, app);
if (app->size != sizeof(uint32)) if (app->size != sizeof(uint32))
Log.Out(Logs::General, Logs::Error, "Invalid size on OP_TributeToggle packet"); Log.Out(Logs::General, Logs::Error, "Invalid size on OP_TributeToggle packet");
@ -13820,7 +13803,6 @@ void Client::Handle_OP_TributeToggle(const EQApplicationPacket *app)
void Client::Handle_OP_TributeUpdate(const EQApplicationPacket *app) void Client::Handle_OP_TributeUpdate(const EQApplicationPacket *app)
{ {
Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeUpdate of length %d", app->size); Log.Out(Logs::Detail, Logs::Tribute, "Received OP_TributeUpdate of length %d", app->size);
_pkt(TRIBUTE__IN, app);
//sent when the client changes their tribute settings... //sent when the client changes their tribute settings...
if (app->size != sizeof(TributeInfo_Struct)) if (app->size != sizeof(TributeInfo_Struct))

1
zone/spells.cpp
View File

@ -3865,7 +3865,6 @@ void Corpse::CastRezz(uint16 spellid, Mob* Caster)
rezz->unknown088 = 0x00000000; rezz->unknown088 = 0x00000000;
// We send this to world, because it needs to go to the player who may not be in this zone. // We send this to world, because it needs to go to the player who may not be in this zone.
worldserver.RezzPlayer(outapp, rez_experience, corpse_db_id, OP_RezzRequest); worldserver.RezzPlayer(outapp, rez_experience, corpse_db_id, OP_RezzRequest);
_pkt(SPELLS__REZ, outapp);
safe_delete(outapp); safe_delete(outapp);
} }

11
zone/tasks.cpp
View File

@ -1097,7 +1097,6 @@ void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *Task
Ptr = Ptr + strlen(Ptr) + 1; Ptr = Ptr + strlen(Ptr) + 1;
} }
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -1197,7 +1196,6 @@ void TaskManager::SendTaskSelectorNew(Client *c, Mob *mob, int TaskCount, int *T
outapp->WriteString("Text3 Test"); outapp->WriteString("Text3 Test");
outapp->WriteString(StartZone); // Zone number in ascii outapp->WriteString(StartZone); // Zone number in ascii
} }
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2346,7 +2344,6 @@ void ClientTaskState::SendTaskHistory(Client *c, int TaskIndex) {
} }
} }
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2375,7 +2372,6 @@ void Client::SendTaskActivityComplete(int TaskID, int ActivityID, int TaskIndex,
//tac->unknown5 = 0x00000001; //tac->unknown5 = 0x00000001;
tac->unknown5 = TaskIncomplete; tac->unknown5 = TaskIncomplete;
_pkt(TASKS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2407,7 +2403,6 @@ void Client::SendTaskFailed(int TaskID, int TaskIndex) {
tac->unknown5 = 0; // 0 for task complete or failed. tac->unknown5 = 0; // 0 for task complete or failed.
Log.Out(Logs::General, Logs::Tasks, "[UPDATE] TaskFailed"); Log.Out(Logs::General, Logs::Tasks, "[UPDATE] TaskFailed");
_pkt(TASKS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2464,7 +2459,6 @@ void TaskManager::SendCompletedTasksToClient(Client *c, ClientTaskState *State)
buf = buf + 4; buf = buf + 4;
} }
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2506,7 +2500,6 @@ void TaskManager::SendTaskActivityShort(Client *c, int TaskID, int ActivityID, i
tass->ActivityType = 0xffffffff; tass->ActivityType = 0xffffffff;
tass->unknown4 = 0x00000000; tass->unknown4 = 0x00000000;
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2594,7 +2587,6 @@ void TaskManager::SendTaskActivityLong(Client *c, int TaskID, int ActivityID, in
tat->unknown1 = 0x00000001; tat->unknown1 = 0x00000001;
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2673,7 +2665,6 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int
outapp->WriteString(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID)); outapp->WriteString(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID));
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2856,7 +2847,6 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN
tdt = (TaskDescriptionTrailer_Struct*)Ptr; tdt = (TaskDescriptionTrailer_Struct*)Ptr;
tdt->Points = 0x00000000; // Points Count tdt->Points = 0x00000000; // Points Count
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2920,7 +2910,6 @@ void ClientTaskState::CancelTask(Client *c, int SequenceNumber, bool RemoveFromD
cts->unknown4 = 0x00000002; cts->unknown4 = 0x00000002;
Log.Out(Logs::General, Logs::Tasks, "[UPDATE] CancelTask"); Log.Out(Logs::General, Logs::Tasks, "[UPDATE] CancelTask");
_pkt(TASKS__PACKETS, outapp);
c->QueuePacket(outapp); c->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);

22
zone/trading.cpp
View File

@ -1002,7 +1002,6 @@ void Client::Trader_ShowItems(){
outints->Code = BazaarTrader_ShowItems; outints->Code = BazaarTrader_ShowItems;
QueuePacket(outapp); QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
safe_delete(TraderItems); safe_delete(TraderItems);
} }
@ -1026,7 +1025,6 @@ void Client::SendTraderPacket(Client* Trader, uint32 Unknown72)
QueuePacket(outapp); QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
} }
@ -1059,7 +1057,6 @@ void Client::Trader_StartTrader() {
QueuePacket(outapp); QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
@ -1077,7 +1074,6 @@ void Client::Trader_StartTrader() {
entity_list.QueueClients(this, outapp, false); entity_list.QueueClients(this, outapp, false);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
} }
@ -1129,7 +1125,6 @@ void Client::Trader_EndTrader() {
entity_list.QueueClients(this, outapp, false); entity_list.QueueClients(this, outapp, false);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
@ -1143,7 +1138,6 @@ void Client::Trader_EndTrader() {
QueuePacket(outapp); QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
@ -1325,7 +1319,6 @@ void Client::NukeTraderItem(uint16 Slot,int16 Charges,uint16 Quantity,Client* Cu
tdis->ItemID = SerialNumber; tdis->ItemID = SerialNumber;
tdis->Unknown012 = 0; tdis->Unknown012 = 0;
_pkt(TRADING__PACKETS, outapp);
Customer->QueuePacket(outapp); Customer->QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -1355,7 +1348,6 @@ void Client::NukeTraderItem(uint16 Slot,int16 Charges,uint16 Quantity,Client* Cu
Quantity = 1; Quantity = 1;
for(int i = 0; i < Quantity; i++) { for(int i = 0; i < Quantity; i++) {
_pkt(TRADING__PACKETS, outapp2);
this->QueuePacket(outapp2); this->QueuePacket(outapp2);
} }
@ -1609,7 +1601,6 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs,Client* Trader,const EQApplicat
Trader->QueuePacket(outapp2); Trader->QueuePacket(outapp2);
_pkt(TRADING__PACKETS, outapp2);
if(RuleB(Bazaar, AuditTrail)) if(RuleB(Bazaar, AuditTrail))
BazaarAuditTrail(Trader->GetName(), GetName(), BuyItem->GetItem()->Name, outtbs->Quantity, outtbs->Price, 0); BazaarAuditTrail(Trader->GetName(), GetName(), BuyItem->GetItem()->Name, outtbs->Quantity, outtbs->Price, 0);
@ -1618,7 +1609,6 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs,Client* Trader,const EQApplicat
Trader->QueuePacket(outapp); Trader->QueuePacket(outapp);
_pkt(TRADING__PACKETS, outapp);
safe_delete(outapp); safe_delete(outapp);
safe_delete(outapp2); safe_delete(outapp2);
@ -1858,7 +1848,6 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
brds->Unknown012 = 0xFFFFFFFF; brds->Unknown012 = 0xFFFFFFFF;
brds->Unknown016 = 0xFFFFFFFF; brds->Unknown016 = 0xFFFFFFFF;
this->QueuePacket(outapp2); this->QueuePacket(outapp2);
_pkt(TRADING__PACKETS,outapp2);
safe_delete(outapp2); safe_delete(outapp2);
return; return;
} }
@ -1926,7 +1915,6 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
this->QueuePacket(outapp); this->QueuePacket(outapp);
_pkt(TRADING__PACKETS,outapp);
safe_delete(outapp); safe_delete(outapp);
safe_delete_array(buffer); safe_delete_array(buffer);
@ -1943,7 +1931,6 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
this->QueuePacket(outapp2); this->QueuePacket(outapp2);
_pkt(TRADING__PACKETS,outapp2);
safe_delete(outapp2); safe_delete(outapp2);
} }
@ -2021,7 +2008,6 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
Log.Out(Logs::Detail, Logs::Trading, "Telling customer to remove item %i with %i charges and S/N %i", Log.Out(Logs::Detail, Logs::Trading, "Telling customer to remove item %i with %i charges and S/N %i",
ItemID, Charges, gis->SerialNumber[i]); ItemID, Charges, gis->SerialNumber[i]);
_pkt(TRADING__PACKETS, outapp);
Customer->QueuePacket(outapp); Customer->QueuePacket(outapp);
} }
@ -2346,7 +2332,6 @@ void Client::SendBuyerResults(char* searchString, uint32 searchID) {
VARSTRUCT_ENCODE_TYPE(uint32, buf, 0); // Flag for + Items , probably ItemCount VARSTRUCT_ENCODE_TYPE(uint32, buf, 0); // Flag for + Items , probably ItemCount
VARSTRUCT_ENCODE_STRING(buf, buyer->GetName()); // Seller Name VARSTRUCT_ENCODE_STRING(buf, buyer->GetName()); // Seller Name
_pkt(TRADING__BARTER, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -2429,7 +2414,6 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) {
VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0);
VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName());
_pkt(TRADING__BARTER, outapp);
QueuePacket(outapp); QueuePacket(outapp);
} }
} }
@ -2679,7 +2663,6 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
sprintf(Buf, "%s", ItemName); Buf += 64; sprintf(Buf, "%s", ItemName); Buf += 64;
_pkt(TRADING__BARTER, outapp);
QueuePacket(outapp); QueuePacket(outapp);
// This next packet goes to the Buyer and produces the 'You've bought <Qty> <Item> from <Seller> for <money>' // This next packet goes to the Buyer and produces the 'You've bought <Qty> <Item> from <Seller> for <money>'
@ -2742,7 +2725,6 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName());
_pkt(TRADING__BARTER, outapp3);
QueuePacket(outapp3); QueuePacket(outapp3);
safe_delete(outapp3); safe_delete(outapp3);
@ -2774,7 +2756,6 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0);
VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName());
_pkt(TRADING__BARTER, outapp4);
Buyer->QueuePacket(outapp4); Buyer->QueuePacket(outapp4);
safe_delete(outapp4); safe_delete(outapp4);
@ -2820,7 +2801,6 @@ void Client::ToggleBuyerMode(bool TurnOn) {
entity_list.QueueClients(this, outapp, false); entity_list.QueueClients(this, outapp, false);
_pkt(TRADING__BARTER, outapp);
safe_delete(outapp); safe_delete(outapp);
Buyer = TurnOn; Buyer = TurnOn;
@ -2899,7 +2879,6 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) {
VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0);
VARSTRUCT_ENCODE_STRING(Buf, GetName()); VARSTRUCT_ENCODE_STRING(Buf, GetName());
_pkt(TRADING__BARTER, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
} }
@ -2954,7 +2933,6 @@ void Client::BuyerItemSearch(const EQApplicationPacket *app) {
bisr->Action = Barter_BuyerSearch; bisr->Action = Barter_BuyerSearch;
bisr->ResultCount = Count; bisr->ResultCount = Count;
_pkt(TRADING__BARTER, outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
} }

1
zone/worldserver.cpp
View File

@ -684,7 +684,6 @@ void WorldServer::Process() {
sizeof(Resurrect_Struct)); sizeof(Resurrect_Struct));
memcpy(outapp->pBuffer, &srs->rez, sizeof(Resurrect_Struct)); memcpy(outapp->pBuffer, &srs->rez, sizeof(Resurrect_Struct));
client->QueuePacket(outapp); client->QueuePacket(outapp);
_pkt(SPELLS__REZ, outapp);
safe_delete(outapp); safe_delete(outapp);
break; break;
} }