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

Improve feign_memory_list thanks to C++11

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-01-15 21:06:18 -05:00
parent a7a4f9373d
commit 12681f4623
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/MobAI.cpp
View File

@ -934,22 +934,16 @@ void Client::AI_Process()
else else
{ {
if(AIfeignremember_timer->Check()) { if(AIfeignremember_timer->Check()) {
std::set<uint32>::iterator RememberedCharID, tmp; std::set<uint32>::iterator RememberedCharID;
RememberedCharID = feign_memory_list.begin(); RememberedCharID = feign_memory_list.begin();
bool got_one = false;
while (RememberedCharID != feign_memory_list.end()) { while (RememberedCharID != feign_memory_list.end()) {
Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID); Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
if (remember_client == nullptr) { if (remember_client == nullptr) {
//they are gone now... //they are gone now...
tmp = RememberedCharID; RememberedCharID = feign_memory_list.erase(RememberedCharID);
++RememberedCharID;
feign_memory_list.erase(tmp);
} else if (!remember_client->GetFeigned()) { } else if (!remember_client->GetFeigned()) {
AddToHateList(remember_client->CastToMob(),1); AddToHateList(remember_client->CastToMob(),1);
tmp = RememberedCharID; RememberedCharID = feign_memory_list.erase(RememberedCharID);
++RememberedCharID;
feign_memory_list.erase(tmp);
got_one = true;
break; break;
} else { } else {
//they are still feigned, carry on... //they are still feigned, carry on...
@ -1405,22 +1399,16 @@ void Mob::AI_Process() {
// EverHood - 6/14/06 // EverHood - 6/14/06
// Improved Feign Death Memory // Improved Feign Death Memory
// check to see if any of our previous feigned targets have gotten up. // check to see if any of our previous feigned targets have gotten up.
std::set<uint32>::iterator RememberedCharID, tmp; std::set<uint32>::iterator RememberedCharID;
RememberedCharID = feign_memory_list.begin(); RememberedCharID = feign_memory_list.begin();
bool got_one = false;
while (RememberedCharID != feign_memory_list.end()) { while (RememberedCharID != feign_memory_list.end()) {
Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID); Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
if (remember_client == nullptr) { if (remember_client == nullptr) {
//they are gone now... //they are gone now...
tmp = RememberedCharID; RememberedCharID = feign_memory_list.erase(RememberedCharID);
++RememberedCharID;
feign_memory_list.erase(tmp);
} else if (!remember_client->GetFeigned()) { } else if (!remember_client->GetFeigned()) {
AddToHateList(remember_client->CastToMob(),1); AddToHateList(remember_client->CastToMob(),1);
tmp = RememberedCharID; RememberedCharID = feign_memory_list.erase(RememberedCharID);
++RememberedCharID;
feign_memory_list.erase(tmp);
got_one = true;
break; break;
} else { } else {
//they are still feigned, carry on... //they are still feigned, carry on...