# HG changeset patch # User peter1138 # Date 2008-08-25 18:14:19 # Node ID 86dbfdd159ca1df3791b949995049124efa17308 # Parent befbb5dbaa37e6cf02938ebbaab4ed92509fe05b (svn r14173) -Fix: Don't check for rail type and catenary on aqueducts. diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1011,8 +1011,10 @@ static void DrawTile_TunnelBridge(TileIn DrawBridgeTramBits(ti->x, ti->y, z, offset, HasBit(rts, ROADTYPE_ROAD), true); } EndSpriteCombine(); - } else if (HasCatenaryDrawn(GetRailType(ti->tile))) { - DrawCatenary(ti); + } else if (transport_type == TRANSPORT_RAIL) { + if (HasCatenaryDrawn(GetRailType(ti->tile))) { + DrawCatenary(ti); + } } DrawBridgeMiddle(ti); @@ -1139,8 +1141,10 @@ void DrawBridgeMiddle(const TileInfo* ti EndSpriteCombine(); StartSpriteCombine(); } - } else if (HasCatenaryDrawn(GetRailType(rampsouth))) { - DrawCatenaryOnBridge(ti); + } else if (transport_type == TRANSPORT_RAIL) { + if (HasCatenaryDrawn(GetRailType(rampsouth))) { + DrawCatenaryOnBridge(ti); + } } /* draw roof, the component of the bridge which is logically between the vehicle and the camera */