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

Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls.

Browse Source
This commit is contained in:
Derision 2013-03-17 13:52:43 +00:00
parent 8eef122cec
commit 981cabe857
7 changed files with 11 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
zone/client_packet.cpp
View File

@ -3540,13 +3540,11 @@ void Client::Handle_OP_WearChange(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(WearChange_Struct)) { if (app->size != sizeof(WearChange_Struct)) {
cout << "Wrong size: OP_WearChange, size=" << app->size << ", expected " << sizeof(WearChange_Struct) << endl; cout << "Wrong size: OP_WearChange, size=" << app->size << ", expected " << sizeof(WearChange_Struct) << endl;
//DumpPacket(app); DumpPacket(app);
return; return;
} }
WearChange_Struct* wc=(WearChange_Struct*)app->pBuffer; WearChange_Struct* wc=(WearChange_Struct*)app->pBuffer;
//printf("Wearchange:\n");
//DumpPacket(app);
if(wc->spawn_id != GetID()) if(wc->spawn_id != GetID())
return; return;
@ -3597,7 +3595,7 @@ void Client::Handle_OP_WhoAllRequest(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Who_All_Struct)) { if (app->size != sizeof(Who_All_Struct)) {
cout << "Wrong size on OP_WhoAll. Got: " << app->size << ", Expected: " << sizeof(Who_All_Struct) << endl; cout << "Wrong size on OP_WhoAll. Got: " << app->size << ", Expected: " << sizeof(Who_All_Struct) << endl;
//DumpPacket(app); DumpPacket(app);
return; return;
} }
Who_All_Struct* whoall = (Who_All_Struct*) app->pBuffer; Who_All_Struct* whoall = (Who_All_Struct*) app->pBuffer;
@ -3696,7 +3694,6 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app)
Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer)); Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer));
if (entity == 0) { if (entity == 0) {
//DumpPacket(app);
Message(13, "Error: OP_EndLootRequest: Corpse not found (ent = 0)"); Message(13, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
if(GetClientVersion() >= EQClientSoD) if(GetClientVersion() >= EQClientSoD)
Corpse::SendEndLootErrorPacket(this); Corpse::SendEndLootErrorPacket(this);
@ -7388,27 +7385,6 @@ void Client::Handle_OP_Emote(const EQApplicationPacket *app)
memcpy(out->message, name, len_name); memcpy(out->message, name, len_name);
memcpy(&out->message[len_name], in->message, len_msg); memcpy(&out->message[len_name], in->message, len_msg);
//cout << "######### Outgoing emote packet" << endl;
//DumpPacket(outapp);
/*
if (target && target->IsClient()) {
entity_list.QueueCloseClients(this, outapp, false, 100, target);
cptr = outapp->pBuffer + 2;
// not sure if live does this or not. thought it was a nice feature, but would take a lot to
// clean up grammatical and other errors. Maybe with a regex parser...
replacestr((char *)cptr, target->GetName(), "you");
replacestr((char *)cptr, " he", " you");
replacestr((char *)cptr, " she", " you");
replacestr((char *)cptr, " him", " you");
replacestr((char *)cptr, " her", " you");
target->CastToClient()->QueuePacket(outapp);
}
else
*/
entity_list.QueueCloseClients(this, outapp, true, 100,0,true,FilterSocials); entity_list.QueueCloseClients(this, outapp, true, 100,0,true,FilterSocials);
safe_delete(outapp); safe_delete(outapp);
@ -7429,7 +7405,6 @@ void Client::Handle_OP_Animation(const EQApplicationPacket *app)
//might verify spawn ID, but it wouldent affect anything //might verify spawn ID, but it wouldent affect anything
// an emote (i.e., waving arm to say hello)
DoAnim(s->action, s->value); DoAnim(s->action, s->value);
return; return;
@ -7853,7 +7828,6 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
if(Buyer) { if(Buyer) {
Trader_EndTrader(); Trader_EndTrader();
Message(13, "You cannot be a Trader and Buyer at the same time."); Message(13, "You cannot be a Trader and Buyer at the same time.");
DumpPacket(app);
return; return;
} }
@ -7892,7 +7866,6 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
if(!TradeItemsValid) { if(!TradeItemsValid) {
Trader_EndTrader(); Trader_EndTrader();
DumpPacket(app);
return; return;
} }
@ -7948,7 +7921,6 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
return; return;
} }
DumpPacket(app);
return; return;
} }
@ -8127,8 +8099,6 @@ void Client::Handle_OP_ClientError(const EQApplicationPacket *app)
ClientError_Struct* error = (ClientError_Struct*)app->pBuffer; ClientError_Struct* error = (ClientError_Struct*)app->pBuffer;
LogFile->write(EQEMuLog::Error, "Client error: %s", error->character_name); LogFile->write(EQEMuLog::Error, "Client error: %s", error->character_name);
LogFile->write(EQEMuLog::Error, "Error message:%s", error->message); LogFile->write(EQEMuLog::Error, "Error message:%s", error->message);
//if (EQDEBUG>=5)
// DumpPacket(app);
return; return;
} }
@ -13611,8 +13581,6 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app)
uint32 merc_unk1 = mmrq->MercUnk01; uint32 merc_unk1 = mmrq->MercUnk01;
uint32 merc_unk2 = mmrq->MercUnk02; uint32 merc_unk2 = mmrq->MercUnk02;
//DumpPacket(app);
if(MERC_DEBUG > 0) if(MERC_DEBUG > 0)
Message(7, "Mercenary Debug: Template ID (%i), Merchant ID (%i), Unknown1 (%i), Unknown2 (%i)", merc_template_id, merchant_id, merc_unk1, merc_unk2); Message(7, "Mercenary Debug: Template ID (%i), Merchant ID (%i), Unknown1 (%i), Unknown2 (%i)", merc_template_id, merchant_id, merc_unk1, merc_unk2);
@ -13674,8 +13642,6 @@ void Client::Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app)
SuspendMercenary_Struct* sm = (SuspendMercenary_Struct*) app->pBuffer; SuspendMercenary_Struct* sm = (SuspendMercenary_Struct*) app->pBuffer;
uint32 merc_suspend = sm->SuspendMerc; // Seen 30 for suspending or unsuspending uint32 merc_suspend = sm->SuspendMerc; // Seen 30 for suspending or unsuspending
//DumpPacket(app);
if(MERC_DEBUG > 0) if(MERC_DEBUG > 0)
Message(7, "Mercenary Debug: Suspend ( %i ) received.", merc_suspend); Message(7, "Mercenary Debug: Suspend ( %i ) received.", merc_suspend);
@ -13700,8 +13666,6 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
uint32 merc_command = mc->MercCommand; // Seen 0 (zone in with no merc or suspended), 1 (dismiss merc), 5 (normal state), 20 (unknown), 36 (zone in with merc) uint32 merc_command = mc->MercCommand; // Seen 0 (zone in with no merc or suspended), 1 (dismiss merc), 5 (normal state), 20 (unknown), 36 (zone in with merc)
int32 option = mc->Option; // Seen -1 (zone in with no merc), 0 (setting to passive stance), 1 (normal or setting to balanced stance) int32 option = mc->Option; // Seen -1 (zone in with no merc), 0 (setting to passive stance), 1 (normal or setting to balanced stance)
//DumpPacket(app);
if(MERC_DEBUG > 0) if(MERC_DEBUG > 0)
Message(7, "Mercenary Debug: Command %i, Option %i received.", merc_command, option); Message(7, "Mercenary Debug: Command %i, Option %i received.", merc_command, option);
@ -13754,8 +13718,6 @@ void Client::Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app
return; return;
} }
//DumpPacket(app);
if(MERC_DEBUG > 0) if(MERC_DEBUG > 0)
Message(7, "Mercenary Debug: Data Update Request Received."); Message(7, "Mercenary Debug: Data Update Request Received.");
@ -13776,8 +13738,6 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
return; return;
} }
//DumpPacket(app);
uint8 Command = 0; uint8 Command = 0;
if(app->size > 0) if(app->size > 0)
{ {
@ -13811,8 +13771,6 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
return; return;
} }
//DumpPacket(app);
if(MERC_DEBUG > 0) if(MERC_DEBUG > 0)
Message(7, "Mercenary Debug: Timer Request received."); Message(7, "Mercenary Debug: Timer Request received.");

3
zone/client_process.cpp
View File

@ -930,7 +930,6 @@ void Client::BulkSendInventoryItems() {
ptr += length; ptr += length;
} }
} }
//DumpPacket(outapp);
QueuePacket(outapp); QueuePacket(outapp);
safe_delete(outapp); safe_delete(outapp);
} }
@ -1309,8 +1308,6 @@ void Client::OPMoveCoin(const EQApplicationPacket* app)
int32 *from_bucket = 0, *to_bucket = 0; int32 *from_bucket = 0, *to_bucket = 0;
Mob* trader = trade->With(); Mob* trader = trade->With();
//DumpPacket(app);
// could just do a range, but this is clearer and explicit // could just do a range, but this is clearer and explicit
if if
( (

2
zone/doors.cpp
View File

@ -148,7 +148,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger)
EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoveDoor, sizeof(MoveDoor_Struct)); EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoveDoor, sizeof(MoveDoor_Struct));
MoveDoor_Struct* md = (MoveDoor_Struct*)outapp->pBuffer; MoveDoor_Struct* md = (MoveDoor_Struct*)outapp->pBuffer;
//DumpPacket(app);
md->doorid = door_id; md->doorid = door_id;
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
//used_pawn: Locked doors! Rogue friendly too =) //used_pawn: Locked doors! Rogue friendly too =)

1
zone/inventory.cpp
View File

@ -1980,7 +1980,6 @@ void Client::SendItemPacket(int16 slot_id, const ItemInst* inst, ItemPacketType
#if EQDEBUG >= 9 #if EQDEBUG >= 9
DumpPacket(outapp); DumpPacket(outapp);
#endif #endif
//DumpPacket(outapp);
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
} }

4
zone/tasks.cpp
View File

@ -840,7 +840,6 @@ void ClientTaskState::EnableTask(int CharID, int TaskCount, int *TaskList) {
_log(TASKS__UPDATE, "New enabled task list "); _log(TASKS__UPDATE, "New enabled task list ");
for(unsigned int i=0; i<EnabledTasks.size(); i++) for(unsigned int i=0; i<EnabledTasks.size(); i++)
_log(TASKS__UPDATE, "%i ", EnabledTasks[i]); _log(TASKS__UPDATE, "%i ", EnabledTasks[i]);
fflush(stdout);
if(TasksEnabled.size() == 0 ) return; if(TasksEnabled.size() == 0 ) return;
@ -901,7 +900,6 @@ void ClientTaskState::DisableTask(int CharID, int TaskCount, int *TaskList) {
_log(TASKS__UPDATE, "New enabled task list "); _log(TASKS__UPDATE, "New enabled task list ");
for(unsigned int i=0; i<EnabledTasks.size(); i++) for(unsigned int i=0; i<EnabledTasks.size(); i++)
_log(TASKS__UPDATE, "%i ", EnabledTasks[i]); _log(TASKS__UPDATE, "%i ", EnabledTasks[i]);
fflush(stdout);
if(TasksDisabled.size() == 0) return; if(TasksDisabled.size() == 0) return;
@ -2561,7 +2559,7 @@ 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(TASKS__UPDATE, "TaskFailed"); _log(TASKS__UPDATE, "TaskFailed");
//DumpPacket(outapp); fflush(stdout);
_pkt(TASKS__PACKETS, outapp); _pkt(TASKS__PACKETS, outapp);
QueuePacket(outapp); QueuePacket(outapp);

3
zone/tradeskills.cpp
View File

@ -517,7 +517,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
outp->reply_code = 0x00000000; //success for finding it... outp->reply_code = 0x00000000; //success for finding it...
user->QueuePacket(outapp); user->QueuePacket(outapp);
//DumpPacket(outapp);
safe_delete(outapp); safe_delete(outapp);
@ -665,7 +665,6 @@ void Client::TradeskillSearchResults(const char *query, unsigned long qlen,
reply->trivial = trivial; reply->trivial = trivial;
strn0cpy(reply->recipe_name, name, sizeof(reply->recipe_name)); strn0cpy(reply->recipe_name, name, sizeof(reply->recipe_name));
//DumpPacket(outapp);
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
} }
mysql_free_result(result); mysql_free_result(result);

6
zone/zonedb.cpp
View File

@ -1748,7 +1748,7 @@ bool ZoneDatabase::SaveMerc(Merc *merc) {
} }
} }
safe_delete(Query); safe_delete_array(Query);
if(!errorMessage.empty() || (Result && affectedRows != 1)) { if(!errorMessage.empty() || (Result && affectedRows != 1)) {
if(owner && !errorMessage.empty()) if(owner && !errorMessage.empty())
@ -1917,12 +1917,16 @@ bool ZoneDatabase::DeleteMerc(uint32 merc_id) {
else else
TempCounter++; TempCounter++;
safe_delete_array(Query);
if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM mercs WHERE MercID = '%u'", merc_id), TempErrorMessageBuffer)) { if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM mercs WHERE MercID = '%u'", merc_id), TempErrorMessageBuffer)) {
errorMessage = std::string(TempErrorMessageBuffer); errorMessage = std::string(TempErrorMessageBuffer);
} }
else else
TempCounter++; TempCounter++;
safe_delete_array(Query);
if(TempCounter == 2) if(TempCounter == 2)
Result = true; Result = true;
} }