stick to the closest points to the destination instead of walkboxes' centers

svn-id: r45893

2 files changed, 17 insertions, 7 deletions

diff --git a/engines/teenagent/objects.h b/engines/teenagent/objects.h
index 495ca773ac..3753330d96 100644
--- a/engines/teenagent/objects.h
+++ b/engines/teenagent/objects.h
@@ -78,6 +78,20 @@ struct Rect {
 	inline bool contains(const Rect & rect) const {
 		return rect.left >= left && rect.right <= right && rect.top >= top && rect.bottom <= bottom;
 	}
+	
+	inline Common::Point closest_to(const Common::Point & src) const {
+		Common::Point p(src);
+		if (p.x < left)
+			p.x = left;
+		if (p.x > right)
+			p.x = right;
+
+		if (p.y < top)
+			p.y = top;
+		if (p.y > bottom)
+			p.y = bottom;
+		return p;
+	}
 
 protected:
 	byte * _base;
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp
index 79ce6b1b66..3e5ade2c27 100644
--- a/engines/teenagent/scene.cpp
+++ b/engines/teenagent/scene.cpp
@@ -165,15 +165,11 @@ bool Scene::findPath(Scene::Path &p, const Common::Point &src, const Common::Poi
 		
 	search(nodes, n, m, start / m, start % m, -1, end, 1);
 	int v = end;
+	Common::Point prev(dst);
 	do {
 		debug(1, "backtrace %d", v);
-		Common::Point c = nodes[v].rect.center();
-		if (end / m == v / m) { //same y
-			c.y = dst.y;
-		}
-		if (end % m == v % m) {
-			c.x = dst.x;
-		}
+		Common::Point c = nodes[v].rect.closest_to(prev);
+		prev = c;
 		p.push_front(c);
 		if (v == start)
 			break;