From a1d6354cafc8b6485d2c747eb1a6e5e638a11c55 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 6 Nov 2019 22:47:12 +0000 Subject: [PATCH] Fix: Out of bounds tile access in ErrmsgWindow::OnInitialPosition This fixes part A of #7619, but not part B. Vehicle::x_pos and Vehicle::y_pos are not required to be within the map bounds. See also: GetTileHeightBelowAircraft() --- src/error_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/error_gui.cpp b/src/error_gui.cpp index 2635742c9e..de24be3dda 100644 --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -224,7 +224,7 @@ public: int scr_top = GetMainViewTop() + 20; int scr_bot = GetMainViewBottom() - 20; - Point pt = RemapCoords2(this->position.x, this->position.y); + Point pt = RemapCoords(this->position.x, this->position.y, GetSlopePixelZOutsideMap(this->position.x, this->position.y)); const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; if (this->face == INVALID_COMPANY) { /* move x pos to opposite corner */