cpp/openttd-patchpack/source Changeset - r23725:6c22ecfe5940

Changeset - r23725:6c22ecfe5940

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

PeterN - 6 years ago 2019-05-10 20:07:38
peter1138@openttd.org

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

1 file changed with 1 insertions and 1 deletions:

src/road_cmd.cpp

0 comments (0 inline, 0 general)

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -1263,7 +1263,7 @@ static CommandCost ClearTile_Road(TileIn @@
 			/* Must iterate over the roadtypes in a reverse manner because
 			 * tram tracks must be removed before the road bits. */
 			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);
 				if (tmp_ret.Failed()) return tmp_ret;

0 comments (0 inline, 0 general)