Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Conflicts:
	src/misc.cpp
This commit is contained in:
Jonathan G Rennison
2015-11-11 19:20:36 +00:00
6 changed files with 87 additions and 26 deletions

View File

@@ -44,7 +44,6 @@ void BuildLinkStatsLegend();
struct TunnelBridgeToMap {
TileIndex from_tile;
TileIndex to_tile;
uint8 colour;
};
typedef SmallVector<TunnelBridgeToMap, 64> TunnelBridgeToMapVector;