dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code

Browse Source
This commit is contained in:
rubidium
2011-11-04 10:28:20 +00:00
parent 69162621d8
commit d0689c2924
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/elrail.cpp
View File

@@ -401,9 +401,9 @@ static void DrawCatenaryRailway(const TileInfo *ti)
if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile)) {
Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y;
uint height = GetBridgePixelHeight(GetNorthernBridgeEnd(ti->tile));
uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
if ((height <= GetTileMaxPixelZ(ti->tile) + TILE_HEIGHT) &&
if ((height <= GetTileMaxZ(ti->tile) + 1) &&
(i == PCPpositions[bridgetrack][0] || i == PCPpositions[bridgetrack][1])) {
SetBit(OverridePCP, i);
}
@@ -438,9 +438,9 @@ static void DrawCatenaryRailway(const TileInfo *ti)
/* Don't draw a wire under a low bridge */
if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_CATENARY)) {
uint height = GetBridgePixelHeight(GetNorthernBridgeEnd(ti->tile));
uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
if (height <= GetTileMaxPixelZ(ti->tile) + TILE_HEIGHT) return;
if (height <= GetTileMaxZ(ti->tile) + 1) return;
}
SpriteID wire_normal = GetWireBase(ti->tile);