cpp/openttd-patchpack/source Changeset - r7472:0cec04c23b7d

Changeset - r7472:0cec04c23b7d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 17 years ago 2007-08-25 20:32:18
rubidium@openttd.org

(svn r10979) -Fix [FS#1157]: catenary on tunnel tiles was drawn non-transparant when the other catenary was drawn transparant. Patch by smatz.

2 files changed with 3 insertions and 2 deletions:

src/elrail.cpp

src/tunnelbridge_cmd.cpp

0 comments (0 inline, 0 general)

src/elrail.cpp

➞

Show inline comments

@@ @@ -290,13 +290,14 @@ static void DrawCatenaryRailway(const Ti @@
 			if (IsTunnelTile(ti->tile)) {
 				const SortableSpriteStruct *sss = &CatenarySpriteData_Tunnel[GetTunnelDirection(ti->tile)];
 				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;
+			}
 			byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
 				(HASBIT(PCPstatus, PCPpositions[t][1]) << 1);

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -921,13 +921,13 @@ static void DrawTile_TunnelBridge(TileIn @@
 			RoadTypes rts = GetRoadTypes(ti->tile);
 			if (HASBIT(rts, ROADTYPE_TRAM)) {
 				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);
+		}
 		AddSortableSpriteToDraw(image + 1, PAL_NONE, ti->x + TILE_SIZE - 1, ti->y + TILE_SIZE - 1, 1, 1, 8, (byte)ti->z);

0 comments (0 inline, 0 general)