Merge branch 'signal_tunnels_bridges-sx' into jgrpp

Conflicts:
	src/tunnelbridge.h

(Fixup zoom level changes).
This commit is contained in:
Jonathan G Rennison
2015-11-01 14:07:55 +00:00
3 changed files with 21 additions and 4 deletions

View File

@@ -16,6 +16,7 @@
void MarkBridgeDirty(TileIndex begin, TileIndex end, DiagDirection direction, uint bridge_height, const ZoomLevel mark_dirty_if_zoomlevel_is_below = ZOOM_LVL_END);
void MarkBridgeDirty(TileIndex tile, const ZoomLevel mark_dirty_if_zoomlevel_is_below = ZOOM_LVL_END);
void MarkBridgeOrTunnelDirty(TileIndex tile, const ZoomLevel mark_dirty_if_zoomlevel_is_below = ZOOM_LVL_END);
/**
* Calculates the length of a tunnel or a bridge (without end tiles)