From 9870f2db3aa78afff5e3671f1bfaf2c114b4bd11 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 16 Jun 2022 17:31:24 +0100 Subject: [PATCH] Fix #399: Removing non-rectangular airports clearing non-airport tiles Merge-conflict resolution error in 0b0d1547 --- src/station_cmd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index bf2898262e..e2421f3068 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2897,6 +2897,8 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags) } for (TileIndex tile_cur : st->airport) { + if (!st->TileBelongsToAirport(tile_cur)) continue; + DeleteAnimatedTile(tile_cur); DoClearSquare(tile_cur); DeleteNewGRFInspectWindow(GSF_AIRPORTTILES, tile_cur);