dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assertion failure when removing airport with order backup

Browse Source 
See: #252, https://github.com/OpenTTD/OpenTTD/issues/9113
This commit is contained in:
Jonathan G Rennison
2021-05-03 00:35:47 +01:00
parent ca7dd193d4
commit e0d5bf584d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/station_cmd.cpp
View File

@@ -2638,9 +2638,9 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
for (uint i = 0; i < st->airport.GetNumHangars(); ++i) { for (uint i = 0; i < st->airport.GetNumHangars(); ++i) {
DeleteWindowById( TileIndex tile_cur = st->airport.GetHangarTile(i);
WC_VEHICLE_DEPOT, st->airport.GetHangarTile(i) OrderBackup::Reset(tile_cur, false);
); DeleteWindowById(WC_VEHICLE_DEPOT, tile_cur);
} }
ZoningMarkDirtyStationCoverageArea(st); ZoningMarkDirtyStationCoverageArea(st);
@@ -2654,7 +2654,6 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
nearest->noise_reached -= GetAirportNoiseLevelForDistance(as, dist); nearest->noise_reached -= GetAirportNoiseLevelForDistance(as, dist);
TILE_AREA_LOOP(tile_cur, st->airport) { TILE_AREA_LOOP(tile_cur, st->airport) {
if (IsHangarTile(tile_cur)) OrderBackup::Reset(tile_cur, false);
DeleteAnimatedTile(tile_cur); DeleteAnimatedTile(tile_cur);
DoClearSquare(tile_cur); DoClearSquare(tile_cur);
DeleteNewGRFInspectWindow(GSF_AIRPORTTILES, tile_cur); DeleteNewGRFInspectWindow(GSF_AIRPORTTILES, tile_cur);