petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests 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

10
src/road_cmd.cpp
View File

@@ -1080,9 +1080,9 @@ void DrawTramCatenary(const TileInfo *ti, RoadBits tram)
/* Don't draw the catenary 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 front;
@@ -1187,10 +1187,10 @@ static void DrawRoadBits(TileInfo *ti)
/* Do not draw details (street lights, trees) under low bridge */
if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && (roadside == ROADSIDE_TREES || roadside == ROADSIDE_STREET_LIGHTS)) {
uint height = GetBridgePixelHeight(GetNorthernBridgeEnd(ti->tile));
uint minz = GetTileMaxPixelZ(ti->tile) + 2 * TILE_HEIGHT;
uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
uint minz = GetTileMaxZ(ti->tile) + 2;
if (roadside == ROADSIDE_TREES) minz += TILE_HEIGHT;
if (roadside == ROADSIDE_TREES) minz++;
if (height < minz) return;
}