(svn r12547) -Feature: invisibility options to make objects invisible instead of transparent

1 files changed, 6 insertions, 0 deletions

diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 7906650ab..29168db7f 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -970,6 +970,9 @@ static bool AlwaysDrawUnpavedRoads(TileIndex tile, Roadside roadside)
  */
 void DrawTramCatenary(TileInfo *ti, RoadBits tram)
 {
+	/* Do not draw catenary if it is invisible */
+	if (IsInvisibilitySet(TO_CATENARY)) return;
+
 	/* Don't draw the catenary under a low bridge */
 	if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_CATENARY)) {
 		uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
@@ -1154,6 +1157,9 @@ static void DrawTile_Road(TileInfo *ti)
 
 			DrawGroundSprite(dts->ground.sprite, PAL_NONE);
 
+			/* End now if buildings are invisible */
+			if (IsInvisibilitySet(TO_BUILDINGS)) break;
+
 			for (dtss = dts->seq; dtss->image.sprite != 0; dtss++) {
 				SpriteID image = dtss->image.sprite;
 				SpriteID pal;