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

Fixed memleak in Client::Handle_OP_MercenaryDataRequest (cppcheck)

Browse Source
This commit is contained in:
Derision 2013-03-03 22:22:04 +00:00
parent aceaba0fb0
commit 9a47e79e8e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zone/client_packet.cpp
View File

@ -13503,19 +13503,20 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
} }
NPC* tar = entity_list.GetNPCByID(merchant_id); NPC* tar = entity_list.GetNPCByID(merchant_id);
if(tar) {
if(tar) {
int mercTypeCount = 0; int mercTypeCount = 0;
int mercCount = 0; int mercCount = 0;
if(DistNoRoot(*tar) > USE_NPC_RANGE2)
return;
if(tar->GetClass() != MERCERNARY_MASTER) {
return;
}
MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct; MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct;
if(DistNoRoot(*tar) > USE_NPC_RANGE2)
return;
if(tar->GetClass() != MERCERNARY_MASTER) {
return;
}
mercTypeCount = tar->GetNumMercTypes(GetClientVersion()); mercTypeCount = tar->GetNumMercTypes(GetClientVersion());
mercCount = tar->GetNumMercs(GetClientVersion()); mercCount = tar->GetNumMercs(GetClientVersion());