equal
deleted
inserted
replaced
247 |
247 |
248 if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile)) { |
248 if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile)) { |
249 Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y; |
249 Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y; |
250 uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); |
250 uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); |
251 |
251 |
252 if ((height <= TilePixelHeight(ti->tile) + TILE_HEIGHT) && |
252 if ((height <= GetTileMaxZ(ti->tile) + TILE_HEIGHT) && |
253 (i == PCPpositions[bridgetrack][0] || i == PCPpositions[bridgetrack][1])) { |
253 (i == PCPpositions[bridgetrack][0] || i == PCPpositions[bridgetrack][1])) { |
254 SETBIT(OverridePCP, i); |
254 SETBIT(OverridePCP, i); |
255 } |
255 } |
256 } |
256 } |
257 |
257 |
287 |
287 |
288 /* Don't draw a wire under a low bridge */ |
288 /* Don't draw a wire under a low bridge */ |
289 if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !HASBIT(_transparent_opt, TO_BUILDINGS)) { |
289 if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !HASBIT(_transparent_opt, TO_BUILDINGS)) { |
290 uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); |
290 uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); |
291 |
291 |
292 if (height <= TilePixelHeight(ti->tile) + TILE_HEIGHT) return; |
292 if (height <= GetTileMaxZ(ti->tile) + TILE_HEIGHT) return; |
293 } |
293 } |
294 |
294 |
295 /* Drawing of pylons is finished, now draw the wires */ |
295 /* Drawing of pylons is finished, now draw the wires */ |
296 for (t = TRACK_BEGIN; t < TRACK_END; t++) { |
296 for (t = TRACK_BEGIN; t < TRACK_END; t++) { |
297 if (HASBIT(trackconfig[TS_HOME], t)) { |
297 if (HASBIT(trackconfig[TS_HOME], t)) { |