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

Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-11-03 00:06:01 +00:00
parent 2c2f846e20 2503704d38
commit 33cc6916db
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/viewport.cpp
View File

@@ -2338,7 +2338,7 @@ void ViewportMapDraw(const ViewPort * const vp)
const TunnelBridgeToMap * const tbtm_end = _vd.tunnel_bridge_to_map.End(); const TunnelBridgeToMap * const tbtm_end = _vd.tunnel_bridge_to_map.End();
for (const TunnelBridgeToMap *tbtm = _vd.tunnel_bridge_to_map.Begin(); tbtm != tbtm_end; tbtm++) { // For each bridge or tunnel for (const TunnelBridgeToMap *tbtm = _vd.tunnel_bridge_to_map.Begin(); tbtm != tbtm_end; tbtm++) { // For each bridge or tunnel
TileIndex tile = tbtm->from_tile; TileIndex tile = tbtm->from_tile;
const int z = TileHeight(tile) * 4; const int z = (IsBridge(tile) ? GetBridgeHeight(tile) : GetTileZ(tile)) * TILE_HEIGHT;
TileIndexDiff delta = TileOffsByDiagDir(GetTunnelBridgeDirection(tile)); TileIndexDiff delta = TileOffsByDiagDir(GetTunnelBridgeDirection(tile));
for (; tile != tbtm->to_tile; tile += delta) { // For each tile for (; tile != tbtm->to_tile; tile += delta) { // For each tile
const Point pt = RemapCoords(TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE, z); const Point pt = RemapCoords(TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE, z);