From ba69ac263295e61399dcc23d066b7399e3c3f32a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 25 Aug 2007 20:32:18 +0000 Subject: [PATCH] (svn r10979) -Fix [FS#1157]: catenary on tunnel tiles was drawn non-transparant when the other catenary was drawn transparant. Patch by smatz. --- src/elrail.cpp | 3 ++- src/tunnelbridge_cmd.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/elrail.cpp b/src/elrail.cpp index 160f321506..c93c2c4f10 100644 --- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -293,7 +293,8 @@ static void DrawCatenaryRailway(const TileInfo *ti) AddSortableSpriteToDraw( sss->image, PAL_NONE, ti->x + sss->x_offset, ti->y + sss->y_offset, sss->x_size, sss->y_size, sss->z_size, - GetTileZ(ti->tile) + sss->z_offset + GetTileZ(ti->tile) + sss->z_offset, + HASBIT(_transparent_opt, TO_BUILDINGS) ); break; } diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 26d13e4d8d..6c91739710 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -924,7 +924,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti) static const SpriteID tunnel_sprites[2][4] = { { 28, 78, 79, 27 }, { 5, 76, 77, 4 } }; DrawGroundSprite(SPR_TRAMWAY_BASE + tunnel_sprites[rts - ROADTYPES_TRAM][dir], PAL_NONE); - AddSortableSpriteToDraw(SPR_TRAMWAY_TUNNEL_WIRES + dir, PAL_NONE, ti->x, ti->y, 16, 16, 16, (byte)ti->z); + AddSortableSpriteToDraw(SPR_TRAMWAY_TUNNEL_WIRES + dir, PAL_NONE, ti->x, ti->y, 16, 16, 16, (byte)ti->z, HASBIT(_transparent_opt, TO_BUILDINGS)); } } else if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) { DrawCatenary(ti);