From bdadefd0d23d2c7cd1f84ba2545162b8bc3ddacf Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 2 Feb 2008 21:09:05 +0000 Subject: [PATCH] (svn r12044) -Fix [FS#1741]: crash when centering on a vehicle (aircraft) that is outside of the map. --- src/viewport.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/viewport.cpp b/src/viewport.cpp index 03207e1fa9..0a88939780 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -2159,9 +2159,8 @@ void PlaceObject() /* scrolls the viewport in a window to a given location */ bool ScrollWindowTo(int x , int y, Window *w, bool instant) { - Point pt; - - pt = MapXYZToViewport(w->viewport, x, y, GetSlopeZ(x, y)); + /* The slope cannot be acquired outside of the map, so make sure we are always within the map. */ + Point pt = MapXYZToViewport(w->viewport, x, y, GetSlopeZ(Clamp(x, 0, MapSizeX()), Clamp(y, 0, MapSizeY()))); WP(w, vp_d).follow_vehicle = INVALID_VEHICLE; if (WP(w, vp_d).dest_scrollpos_x == pt.x && WP(w, vp_d).dest_scrollpos_y == pt.y)