Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

This commit is contained in:
Jonathan G Rennison
2015-11-24 01:06:51 +00:00
9 changed files with 36 additions and 30 deletions

View File

@@ -2300,7 +2300,7 @@ static void ViewportMapDrawBridgeTunnel(const ViewPort * const vp, const TunnelB
TileIndex tile = tbtm->from_tile;
const Owner o = GetTileOwner(tile);
if (!_legend_land_owners[_company_to_list_pos[o]].show_on_map) return;
if (o < MAX_COMPANIES && !_legend_land_owners[_company_to_list_pos[o]].show_on_map) return;
uint8 colour;
if (vp->map_type == VPMT_OWNER && _settings_client.gui.use_owner_colour_for_tunnelbridge && o < MAX_COMPANIES) {