diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/viewport.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/viewport.cpp b/src/viewport.cpp index 03207e1fa..0a8893978 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) |