thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: AvoidPath: Don't discard contained-access polygon when starting point

Browse source 
is right next to it.

svn-id: r45521
This commit is contained in:
Walter van Niftrik 2009-10-30 03:54:50 +00:00
parent e36798585f
commit dba613ecd2
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/sci/engine/kpathing.cpp
View file

@ -1049,6 +1049,21 @@ static int nearest_intersection(PathfindingState *s, const Common::Point &p, con
return find_free_point(isec, ipolygon, ret); return find_free_point(isec, ipolygon, ret);
} }
/**
* Checks whether a point is nearby a contained-access polygon (distance 1 pixel)
* @param point the point
* @param polygon the contained-access polygon
* @return true when point is nearby polygon, false otherwise
*/
static bool nearbyPolygon(const Common::Point &point, Polygon *polygon) {
assert(polygon->type == POLY_CONTAINED_ACCESS);
return ((contained(Common::Point(point.x, point.y + 1), polygon) != CONT_INSIDE)
|| (contained(Common::Point(point.x, point.y - 1), polygon) != CONT_INSIDE)
|| (contained(Common::Point(point.x + 1, point.y), polygon) != CONT_INSIDE)
|| (contained(Common::Point(point.x - 1, point.y), polygon) != CONT_INSIDE));
}
/** /**
* Checks that the start point is in a valid position, and takes appropriate action if it's not. * Checks that the start point is in a valid position, and takes appropriate action if it's not.
* @param s the pathfinding state * @param s the pathfinding state
@ -1075,12 +1090,14 @@ static Common::Point *fixup_start_point(PathfindingState *s, const Common::Point
case POLY_CONTAINED_ACCESS: case POLY_CONTAINED_ACCESS:
// Remove contained access polygons that do not contain // Remove contained access polygons that do not contain
// the start point (containment test is inverted here). // the start point (containment test is inverted here).
if (cont == CONT_INSIDE) { // SSCI appears to be using a small margin of error here,
// so we do the same.
if ((cont == CONT_INSIDE) && !nearbyPolygon(start, *it)) {
delete *it; delete *it;
it = s->polygons.erase(it); it = s->polygons.erase(it);
continue; continue;
} }
break; // Fall through
case POLY_BARRED_ACCESS: case POLY_BARRED_ACCESS:
case POLY_NEAREST_ACCESS: case POLY_NEAREST_ACCESS:
if (cont == CONT_INSIDE) { if (cont == CONT_INSIDE) {
@ -1095,7 +1112,7 @@ static Common::Point *fixup_start_point(PathfindingState *s, const Common::Point
return NULL; return NULL;
} }
if (type == POLY_BARRED_ACCESS) if ((type == POLY_BARRED_ACCESS) || (type == POLY_CONTAINED_ACCESS))
warning("AvoidPath: start position at unreachable location"); warning("AvoidPath: start position at unreachable location");
// The original start position is in an invalid location, so we // The original start position is in an invalid location, so we