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

Minor tweaking to zone/entity.cpp

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-09 12:59:13 -05:00
parent b0e59e112d
commit 1b8711bce9
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
zone/entity.cpp
View File

@ -386,11 +386,8 @@ void EntityList::GroupProcess()
return; return;
} }
auto it = group_list.begin(); for (auto &group : group_list)
while (it != group_list.end()) { group->Process();
(*it)->Process();
++it;
}
#if EQDEBUG >= 5 #if EQDEBUG >= 5
CheckGroupList (__FILE__, __LINE__); CheckGroupList (__FILE__, __LINE__);
@ -399,11 +396,8 @@ void EntityList::GroupProcess()
void EntityList::QueueToGroupsForNPCHealthAA(Mob *sender, const EQApplicationPacket *app) void EntityList::QueueToGroupsForNPCHealthAA(Mob *sender, const EQApplicationPacket *app)
{ {
auto it = group_list.begin(); for (auto &group : group_list)
while (it != group_list.end()) { group->QueueHPPacketsForNPCHealthAA(sender, app);
(*it)->QueueHPPacketsForNPCHealthAA(sender, app);
++it;
}
} }
void EntityList::RaidProcess() void EntityList::RaidProcess()
@ -416,11 +410,8 @@ void EntityList::RaidProcess()
return; return;
} }
auto it = raid_list.begin(); for (auto &raid : raid_list)
while (it != raid_list.end()) { raid->Process();
(*it)->Process();
++it;
}
} }
void EntityList::DoorProcess() void EntityList::DoorProcess()
@ -3131,21 +3122,18 @@ void EntityList::AddProximity(NPC *proximity_for)
proximity_list.push_back(proximity_for); proximity_list.push_back(proximity_for);
proximity_for->proximity = new NPCProximity; proximity_for->proximity = new NPCProximity; // deleted in NPC::~NPC
} }
bool EntityList::RemoveProximity(uint16 delete_npc_id) bool EntityList::RemoveProximity(uint16 delete_npc_id)
{ {
auto iter = proximity_list.begin(); auto it = std::find_if(proximity_list.begin(), proximity_list.end(),
[delete_npc_id](const NPC *a) { return a->GetID() == delete_npc_id; });
if (it == proximity_list.end())
return false;
while (iter != proximity_list.end()) { proximity_list.erase(it);
if ((*iter)->GetID() == delete_npc_id) { return true;
proximity_list.erase(iter);
return true;
}
++iter;
}
return false;
} }
void EntityList::RemoveAllLocalities() void EntityList::RemoveAllLocalities()
@ -3348,14 +3336,12 @@ void EntityList::AddArea(int id, int type, float min_x, float max_x, float min_y
void EntityList::RemoveArea(int id) void EntityList::RemoveArea(int id)
{ {
auto iter = area_list.begin(); auto it = std::find_if(area_list.begin(), area_list.end(),
while(iter != area_list.end()) { [id](const Area &a) { return a.id == id; });
if((*iter).id == id) { if (it == area_list.end())
area_list.erase(iter); return;
return;
} area_list.erase(it);
++iter;
}
} }
void EntityList::ClearAreas() void EntityList::ClearAreas()