diff options
author | rubidium <rubidium@openttd.org> | 2007-08-25 20:32:18 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-08-25 20:32:18 +0000 |
commit | ba69ac263295e61399dcc23d066b7399e3c3f32a (patch) | |
tree | a94db92a01966d4a1053a879a79dc5d38f0bf81e | |
parent | c6152e0cd48fb3f36fea6d95bf6296b284f63f57 (diff) | |
download | openttd-ba69ac263295e61399dcc23d066b7399e3c3f32a.tar.xz |
(svn r10979) -Fix [FS#1157]: catenary on tunnel tiles was drawn non-transparant when the other catenary was drawn transparant. Patch by smatz.
-rw-r--r-- | src/elrail.cpp | 3 | ||||
-rw-r--r-- | src/tunnelbridge_cmd.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp index 160f32150..c93c2c4f1 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 26d13e4d8..6c9173971 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); |