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

Change [filter_weapon] to not depend on attack_type::weapon_specials

Browse source 
This changes it to use the function that attack_type::get_value already uses,
thus removing a call to attack_type::weapon_specials. The latter is being
refactored by newfrenchy83, and questions about the effect of that refactor on
this code delayed the review on his PR.

This code is part of the object used for [filter_weapon]formula=, however the
implementation of that filter creates exactly one attack_type_callable, so
doesn't trigger this code. For testing I called it via a debugger.
This commit is contained in:
Steve Cotton 2022-02-07 17:09:14 +01:00 • committed by Steve Cotton
parent c6f9a96a09
commit 6ccac5a5e8
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/formula/callable_objects.cpp
View file

@ -162,7 +162,20 @@ int attack_type_callable::do_compare(const formula_callable* callable) const
return att_->range().compare(att_callable->att_->range());
}
return att_->weapon_specials().compare(att_callable->att_->weapon_specials());
const auto self_specials = att_->specials().all_children_range();
const auto other_specials = att_callable->att_->specials().all_children_range();
if(self_specials.size() != other_specials.size()) {
return self_specials.size() < other_specials.size() ? -1 : 1;
}
for(std::size_t i = 0; i < self_specials.size(); ++i) {
const auto& s = self_specials[i].cfg["id"];
const auto& o = other_specials[i].cfg["id"];
if(s != o) {
return s.str().compare(o.str());
}
}
return 0;
}
unit_callable::unit_callable(const unit& u) : loc_(u.get_location()), u_(u)