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

Made shortest_path formula function return empty array...

Browse source 
...if destination is unreachable, use simplest_path if you want to get
some result no matter what
This commit is contained in:
Bartek Waresiak 2009-03-05 23:34:17 +00:00
parent f296c39716
commit 03e05ed78b
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/formula_ai.cpp
View file

@ -493,21 +493,12 @@ private:
paths::route route = ai_.shortest_path_calculator( src, dst, unit_it, allowed_teleports );
if( route.steps.size() == 0 ) {
emergency_path_calculator em_calc(unit_it->second, ai_.get_info().map);
route = a_star_search(src, dst, 1000.0, &em_calc, ai_.get_info().map.w(), ai_.get_info().map.h(), &allowed_teleports);
if( route.steps.size() < 2 ) {
return variant(&locations);
}
if( route.steps.size() < 2 ) {
return variant(&locations);
}
for (std::vector<map_location>::const_iterator loc_iter = route.steps.begin() + 1 ; loc_iter !=route.steps.end(); ++loc_iter) {
if( unit_it->second.movement_cost(ai_.get_info().map[*loc_iter]) < 99 )
locations.push_back( variant( new location_callable(*loc_iter) ));
else
break;
locations.push_back( variant( new location_callable(*loc_iter) ));
}
return variant(&locations);