0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7150 from newfrenchy83/include_erase_if_in_overwrite_specials

Browse source 
include Refactor ability lists using utils::erase_if and std::remove_if to overwrite_specials
This commit is contained in:
Charles Dang 2022-11-20 14:14:00 -05:00 • committed by GitHub
commit 59bb2bb47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/units/abilities.cpp
View file

@ -1296,24 +1296,19 @@ unit_ability_list attack_type::overwrite_special_checking(const std::string& abi
for(const auto& i : overwriters) {
bool affect_side = ((*i.ability_cfg)["overwrite_specials"] == "one_side");
for(unit_ability_list::iterator j = input.begin(); j != input.end();) {
bool is_overwritable = (is_special || !overwrite_special_affects(*j->ability_cfg));
utils::erase_if(input, [&](const unit_ability& j) {
bool is_overwritable = (is_special || !overwrite_special_affects(*j.ability_cfg));
bool one_side_overwritable = true;
if(affect_side && is_overwritable){
if(special_active_impl(shared_from_this(), other_attack_, *i.ability_cfg, AFFECT_SELF, ability, filter_self)){
one_side_overwritable = special_active_impl(shared_from_this(), other_attack_, *j->ability_cfg, AFFECT_SELF, ability, filter_self);
one_side_overwritable = special_active_impl(shared_from_this(), other_attack_, *j.ability_cfg, AFFECT_SELF, ability, filter_self);
}
else if(special_active_impl(other_attack_, shared_from_this(), *i.ability_cfg, AFFECT_OTHER, ability, filter_self)){
one_side_overwritable = special_active_impl(other_attack_, shared_from_this(), *j->ability_cfg, AFFECT_OTHER, ability, filter_self);
one_side_overwritable = special_active_impl(other_attack_, shared_from_this(), *j.ability_cfg, AFFECT_OTHER, ability, filter_self);
}
}
is_overwritable = is_overwritable && one_side_overwritable;
if(is_overwritable) {
j = input.erase(j);
} else {
++j;
}
}
return (is_overwritable && one_side_overwritable);
});
}
return input;
}