--- a/src/tunnelbridge_cmd.cpp	Thu Mar 27 05:15:06 2008 +0000
+++ b/src/tunnelbridge_cmd.cpp	Fri Mar 28 10:32:55 2008 +0000
@@ -859,7 +859,7 @@
 				StartSpriteCombine();
 				AddSortableSpriteToDraw(SPR_TRAMWAY_TUNNEL_WIRES + tunnelbridge_direction, PAL_NONE, ti->x, ti->y, BB_data[10], BB_data[11], TILE_HEIGHT, ti->z, IsTransparencySet(TO_CATENARY), BB_data[8], BB_data[9], BB_Z_SEPARATOR);
 			}
-		} else if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) {
+		} else if (HasCatenary(GetRailType(ti->tile))) {
 			DrawCatenary(ti);
 
 			catenary = true;
@@ -935,7 +935,7 @@
 				DrawBridgeTramBits(ti->x, ti->y, z, offset, HasBit(rts, ROADTYPE_ROAD));
 			}
 			EndSpriteCombine();
-		} else if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) {
+		} else if (HasCatenary(GetRailType(ti->tile))) {
 			DrawCatenary(ti);
 		}
 
@@ -1061,7 +1061,7 @@
 			EndSpriteCombine();
 			StartSpriteCombine();
 		}
-	} else if (GetRailType(rampsouth) == RAILTYPE_ELECTRIC) {
+	} else if (HasCatenary(GetRailType(rampsouth))) {
 		DrawCatenary(ti);
 	}