pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-23 23:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Group/raid memleaks

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-03 02:57:55 -05:00
parent 1b5db0684e
commit 9b8598c566
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zone/entity.cpp
View File

@ -2026,13 +2026,16 @@ void EntityList::RemoveAllNPCs()
void EntityList::RemoveAllMercs() void EntityList::RemoveAllMercs()
{ {
// doesn't clear the data
merc_list.clear(); merc_list.clear();
} }
void EntityList::RemoveAllGroups() void EntityList::RemoveAllGroups()
{ {
while (group_list.size()) while (group_list.size()) {
safe_delete(group_list.front());
group_list.pop_front(); group_list.pop_front();
}
#if EQDEBUG >= 5 #if EQDEBUG >= 5
CheckGroupList (__FILE__, __LINE__); CheckGroupList (__FILE__, __LINE__);
#endif #endif
@ -2040,8 +2043,10 @@ void EntityList::RemoveAllGroups()
void EntityList::RemoveAllRaids() void EntityList::RemoveAllRaids()
{ {
while (raid_list.size()) while (raid_list.size()) {
safe_delete(raid_list.front());
raid_list.pop_front(); raid_list.pop_front();
}
} }
void EntityList::RemoveAllDoors() void EntityList::RemoveAllDoors()
@ -2251,7 +2256,8 @@ bool EntityList::RemoveGroup(uint32 delete_id)
while(iterator != group_list.end()) while(iterator != group_list.end())
{ {
if((*iterator)->GetID() == delete_id) { if((*iterator)->GetID() == delete_id) {
group_list.remove (*iterator); safe_delete(*iterator);
group_list.remove(*iterator);
#if EQDEBUG >= 5 #if EQDEBUG >= 5
CheckGroupList (__FILE__, __LINE__); CheckGroupList (__FILE__, __LINE__);
#endif #endif
@ -2274,7 +2280,8 @@ bool EntityList::RemoveRaid(uint32 delete_id)
while(iterator != raid_list.end()) while(iterator != raid_list.end())
{ {
if((*iterator)->GetID() == delete_id) { if((*iterator)->GetID() == delete_id) {
raid_list.remove (*iterator); safe_delete(*iterator);
raid_list.remove(*iterator);
return true; return true;
} }
++iterator; ++iterator;