# HG changeset patch # User frosch # Date 2011-12-17 23:14:28 # Node ID 6d5849476f85101cccb41c2e362cf419b8c833eb # Parent 9b130c7af3d2785ab877838a66562862dbc1a1ea (svn r23584) -Fix: Draw PBS reservations also for tunnels with railtype overlays. diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1100,12 +1100,6 @@ static void DrawTile_TunnelBridge(TileIn image += tunnelbridge_direction * 2; DrawGroundSprite(image, PAL_NONE); - /* PBS debugging, draw reserved tracks darker */ - if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && (transport_type == TRANSPORT_RAIL && HasTunnelBridgeReservation(ti->tile))) { - const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile)); - DrawGroundSprite(DiagDirToAxis(tunnelbridge_direction) == AXIS_X ? rti->base_sprites.single_x : rti->base_sprites.single_y, PALETTE_CRASH); - } - if (transport_type == TRANSPORT_ROAD) { RoadTypes rts = GetRoadTypes(ti->tile); @@ -1128,6 +1122,11 @@ static void DrawTile_TunnelBridge(TileIn if (surface != 0) DrawGroundSprite(surface + tunnelbridge_direction, PAL_NONE); } + /* PBS debugging, draw reserved tracks darker */ + if (_game_mode != GM_MENU && _settings_client.gui.show_track_reservation && HasTunnelBridgeReservation(ti->tile)) { + DrawGroundSprite(DiagDirToAxis(tunnelbridge_direction) == AXIS_X ? rti->base_sprites.single_x : rti->base_sprites.single_y, PALETTE_CRASH); + } + if (HasCatenaryDrawn(GetRailType(ti->tile))) { /* Maybe draw pylons on the entry side */ DrawCatenary(ti);