summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2008-08-25 18:14:19 +0000
committerpeter1138 <peter1138@openttd.org>2008-08-25 18:14:19 +0000
commitb60ff46806d6ec9398813beda2a0392e09ebacb4 (patch)
tree3557ebf84b0d5e6149361d1d5ba06d0c642a71d8
parent23a9938317cc66def8fe88b55953757bbee45a9b (diff)
downloadopenttd-b60ff46806d6ec9398813beda2a0392e09ebacb4.tar.xz
(svn r14173) -Fix: Don't check for rail type and catenary on aqueducts.
-rw-r--r--src/tunnelbridge_cmd.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index 08588e4ed..5b83c2ddd 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -1011,8 +1011,10 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
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 @@ void DrawBridgeMiddle(const TileInfo* ti)
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 */