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

Check whether the unit is valid before using it.

Browse source 
Fixes #6863.
This commit is contained in:
Pentarctagon 2022-07-13 09:55:45 -05:00
parent 314d1031f7
commit fd5de5c9e5
No known key found for this signature in database
GPG key ID: 9456BC54A21DBFA0
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/pathfind/pathfind.cpp
View file

@ -609,10 +609,19 @@ vision_path::vision_path(const movetype::terrain_costs & view_costs, bool slowed
// The three nullptr parameters indicate (in order):
// ignore units, ignore ZoC (no effect), and don't build a cost_map.
const unit_map::const_iterator u = resources::gameboard->units().find(loc);
// The viewing team needs to be the unit's team here.
const team& viewing_team = resources::gameboard->get_team(u->side());
find_routes(loc, view_costs, slowed, sight_range, sight_range, 0,
destinations, &edges, u.valid() ? &*u : nullptr, nullptr, nullptr, &viewing_team, &jamming_map, nullptr, true);
if(u.valid())
{
// The viewing team needs to be the unit's team here.
const team& viewing_team = resources::gameboard->get_team(u->side());
find_routes(loc, view_costs, slowed, sight_range, sight_range, 0,
destinations, &edges, &*u, nullptr, nullptr, &viewing_team, &jamming_map, nullptr, true);
}
else
{
find_routes(loc, view_costs, slowed, sight_range, sight_range, 0,
destinations, &edges, nullptr, nullptr, nullptr, nullptr, &jamming_map, nullptr, true);
}
}
/** Default destructor */