openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Remove custom erase_if function in favor of std::remove_if

Browse Source 
It was originally added before I understood the correct way to use remove_if

As a side-effect, remove bad status now also removes forcecage and charm.
This commit is contained in:
Celtic Minstrel
2017-04-14 01:16:57 -04:00
parent 936a848166
commit 5b5b2af46f
4 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/game/boe.town.cpp
View File

@@ -578,9 +578,10 @@ location end_town_mode(short switching_level,location destination) { // returns
to_return = univ.party.out_loc;
erase_if(univ.party.party_event_timers, [](const cTimer& t) {
auto& timers = univ.party.party_event_timers;
timers.erase(std::remove_if(timers.begin(), timers.end(), [](const cTimer& t) {
return t.node_type == 2;
});
}), timers.end());
}
@@ -629,16 +630,8 @@ location end_town_mode(short switching_level,location destination) { // returns
univ.party.status[ePartyStatus::STEALTH] = 0;
univ.party.status[ePartyStatus::DETECT_LIFE] = 0; // TODO: Yes? No? Maybe?
for(short i = 0; i < 6; i++)
erase_if(univ.party[i].status, [](std::pair<const eStatus, short> kv) -> bool {
if(kv.first == eStatus::POISON) return false;
if(kv.first == eStatus::DISEASE) return false;
if(kv.first == eStatus::DUMB) return false;
if(kv.first == eStatus::ACID && kv.second > 2)
return false;
return true;
});
for(cPlayer& who : univ.party)
who.clear_brief_status();
update_explored(to_return);
redraw_screen(REFRESH_TERRAIN | REFRESH_TEXT);