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

Merge pull request #144 from Kevin-Xi/bugfix

Browse source 
fix bugs and add comments on simple_move_and_targeting_phase
This commit is contained in:
Iurii Chernyi 2014-04-10 15:58:45 +02:00
commit f1b0e66629
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ai/testing/ca.cpp
View file

@ -1958,6 +1958,11 @@ simple_move_and_targeting_phase::~simple_move_and_targeting_phase()
double simple_move_and_targeting_phase::evaluate()
{
// Pick first enemy leader, move all units as close to
// enemy leader as possible.
// Own leader should not be moved.
// Code does not support multiple leaders per side.
// Do it fast even if there is a lot of units present.
unit_map &units_ = *resources::units;
unit_map::const_iterator leader = units_.find_leader(get_side());
@ -1980,15 +1985,13 @@ double simple_move_and_targeting_phase::evaluate()
std::pair<map_location,map_location> closest_move;
for(move_map::const_iterator i = get_dstsrc().begin(); i != get_dstsrc().end(); ++i) {
if(my_leader_loc == i->first && get_passive_leader()){//passive_leader
if(my_leader_loc == i->second){// Do not move leaders.
continue;
}
int distance = distance_between(i->first, leader->get_location());
const int distance = distance_between(i->first, leader->get_location());
if(closest_distance == -1 || distance < closest_distance) {
if ((i->second!=my_leader_loc) && (i->second!=i->first)) {
closest_distance = distance;
closest_move = *i;
}
closest_distance = distance;
closest_move = *i;
}
}