(svn r14173) -Fix: Don't check for rail type and catenary on aqueducts.
authorpeter1138
Mon, 25 Aug 2008 18:14:19 +0000
changeset 10014 13c9ede0ae49
parent 10013 cf6837425ca9
child 10015 2b721243365f
(svn r14173) -Fix: Don't check for rail type and catenary on aqueducts.
src/tunnelbridge_cmd.cpp
--- a/src/tunnelbridge_cmd.cpp	Mon Aug 25 17:16:27 2008 +0000
+++ b/src/tunnelbridge_cmd.cpp	Mon Aug 25 18:14:19 2008 +0000
@@ -1011,8 +1011,10 @@
 				DrawBridgeTramBits(ti->x, ti->y, z, offset, HasBit(rts, ROADTYPE_ROAD), true);
 			}
 			EndSpriteCombine();
-		} else if (HasCatenaryDrawn(GetRailType(ti->tile))) {
-			DrawCatenary(ti);
+		} else if (transport_type == TRANSPORT_RAIL) {
+			if (HasCatenaryDrawn(GetRailType(ti->tile))) {
+				DrawCatenary(ti);
+			}
 		}
 
 		DrawBridgeMiddle(ti);
@@ -1139,8 +1141,10 @@
 			EndSpriteCombine();
 			StartSpriteCombine();
 		}
-	} else if (HasCatenaryDrawn(GetRailType(rampsouth))) {
-		DrawCatenaryOnBridge(ti);
+	} else if (transport_type == TRANSPORT_RAIL) {
+		if (HasCatenaryDrawn(GetRailType(rampsouth))) {
+			DrawCatenaryOnBridge(ti);
+		}
 	}
 
 	/* draw roof, the component of the bridge which is logically between the vehicle and the camera */