mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7576: Crash when destroying rail/tram crossing. (#7579)

pull/7584/head
PeterN 2019-05-10 21:07:38 +01:00 committed by GitHub
parent 24c59283ec
commit f4921d2c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/road_cmd.cpp
View File

@ -1263,7 +1263,7 @@ static CommandCost ClearTile_Road(TileIndex tile, DoCommandFlag flags)
/* Must iterate over the roadtypes in a reverse manner because /* Must iterate over the roadtypes in a reverse manner because
* tram tracks must be removed before the road bits. */ * tram tracks must be removed before the road bits. */
for (RoadTramType rtt : { RTT_TRAM, RTT_ROAD }) { for (RoadTramType rtt : { RTT_TRAM, RTT_ROAD }) {
if (GetRoadType(tile, rtt) == INVALID_ROADTYPE) continue; if (!MayHaveRoad(tile) || GetRoadType(tile, rtt) == INVALID_ROADTYPE) continue;
CommandCost tmp_ret = RemoveRoad(tile, flags, GetCrossingRoadBits(tile), rtt, false); CommandCost tmp_ret = RemoveRoad(tile, flags, GetCrossingRoadBits(tile), rtt, false);
if (tmp_ret.Failed()) return tmp_ret; if (tmp_ret.Failed()) return tmp_ret;