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

AI: fix [leader_goal] for sides with multiple leaders

Browse source 
Previously the AI would only move one of the leaders.
This commit is contained in:
mattsc 2019-11-19 08:24:02 -08:00
parent 78a40c8dcb
commit a9d9fbaccd
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/ai/default/ca.cpp
View file

@ -280,8 +280,21 @@ double move_leader_to_goals_phase::evaluate()
return BAD_SCORE; return BAD_SCORE;
} }
const unit_map::iterator leader = resources::gameboard->units().find_leader(get_side()); const unit_map &units_ = resources::gameboard->units();
if (!leader.valid() || leader->incapacitated()) { const std::vector<unit_map::const_iterator> leaders = units_.find_leaders(get_side());
if (leaders.empty()) {
return BAD_SCORE;
}
const unit* leader = nullptr;
for (const unit_map::const_iterator& l_itor : leaders) {
if (!l_itor->incapacitated() && l_itor->movement_left() > 0) {
leader = &(*l_itor);
break;
}
}
if (leader == nullptr) {
WRN_AI_TESTING_AI_DEFAULT << "Leader not found" << std::endl; WRN_AI_TESTING_AI_DEFAULT << "Leader not found" << std::endl;
return BAD_SCORE; return BAD_SCORE;
} }