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

wb: fixup fix handling of extra_recruit and [filter_recall]

Browse source 
this was probably lost during rebasing.
This commit is contained in:
gfgtdf 2018-05-20 12:42:03 +02:00 • committed by Charles Dang
parent 23732cf40f
commit 0f2b4fae1d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/whiteboard/recall.cpp
View file

@ -226,7 +226,7 @@ action::error recall::check_validity() const
return NOT_ENOUGH_GOLD;
}
//Check that there is a leader available to recall this unit
bool has_recruiter = any_recruiter(team_index() - 1, get_recall_hex(), [&](unit& leader) {
bool has_recruiter = any_recruiter(team_index() + 1, get_recall_hex(), [&](unit& leader) {
const unit_filter ufilt(vconfig(leader.recall_filter()));
return ufilt(*temp_unit_, map_location::null_location());
});

2
src/whiteboard/recruit.cpp
View file

@ -199,7 +199,7 @@ action::error recruit::check_validity() const
//Check that unit to recruit is still in side's recruit list
const std::set<std::string>& recruits = resources::gameboard->teams()[team_index()].recruits();
if(recruits.find(unit_name_) == recruits.end()) {
bool in_extra_recruit = any_recruiter(team_index() - 1, get_recruit_hex(), [&](unit& leader) {
bool in_extra_recruit = any_recruiter(team_index() + 1, get_recruit_hex(), [&](unit& leader) {
return std::find(leader.recruits().begin(), leader.recruits().end(), unit_name_) != leader.recruits().end();
});
if (!in_extra_recruit) {