From 49ce7fe169098edcf3830e48b3fde1f9d657f117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Sun, 6 Apr 2025 15:01:23 +0200 Subject: [PATCH] Fix 8846f347f2: Check bridge/tunnel transport type before querying road type (#13969) --- src/tunnelbridge_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 67ad64b83e..a54789e1f7 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1697,8 +1697,8 @@ static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc &td) Owner road_owner = INVALID_OWNER; Owner tram_owner = INVALID_OWNER; - RoadType road_rt = GetRoadTypeRoad(tile); - RoadType tram_rt = GetRoadTypeTram(tile); + RoadType road_rt = (tt == TRANSPORT_ROAD) ? GetRoadTypeRoad(tile) : INVALID_ROADTYPE; + RoadType tram_rt = (tt == TRANSPORT_ROAD) ? GetRoadTypeTram(tile) : INVALID_ROADTYPE; if (road_rt != INVALID_ROADTYPE) { const RoadTypeInfo *rti = GetRoadTypeInfo(road_rt); td.roadtype = rti->strings.name;