Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx

9 years ago · 0ee812b5a9
parent 16c5a0a812 f770dd1ed9
commit 0ee812b5a9
1 changed files with 1 additions and 1 deletions
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@ -1533,7 +1533,7 @@ static void ViewportMapStoreBridgeTunnel(const ViewPort * const vp, const TileIn
 		if (!_settings_client.gui.show_bridges_on_map) return;
 	}
 	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;

 	/* Check if already stored */
 	TunnelBridgeToMapVector * const tbtmv = tile_is_tunnel ? &_vd.tunnel_to_map : &_vd.bridge_to_map;