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

Viewport map: Use transport colour for road bridge/tunnels and aqueducts

Browse Source 
In route mode
This commit is contained in:
Jonathan G Rennison
2023-05-25 18:06:59 +01:00
parent b5ee8e9e42
commit f053082478
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/viewport.cpp
View File

@@ -3435,8 +3435,35 @@ static void ViewportMapDrawBridgeTunnel(Viewport * const vp, const TunnelBridgeT
if (vp->map_type == VPMT_OWNER && _settings_client.gui.use_owner_colour_for_tunnelbridge && o < MAX_COMPANIES) { if (vp->map_type == VPMT_OWNER && _settings_client.gui.use_owner_colour_for_tunnelbridge && o < MAX_COMPANIES) {
colour = _legend_land_owners[_company_to_list_pos[o]].colour; colour = _legend_land_owners[_company_to_list_pos[o]].colour;
colour = is_tunnel ? _darken_colour[colour] : _lighten_colour[colour]; colour = is_tunnel ? _darken_colour[colour] : _lighten_colour[colour];
} else if (vp->map_type == VPMT_ROUTES && IsRailTunnelBridgeTile(tile)) { } else if (vp->map_type == VPMT_ROUTES && IsTileType(tile, MP_TUNNELBRIDGE)) {
colour = GetRailTypeInfo(GetRailType(tile))->map_colour; switch (GetTunnelBridgeTransportType(tile)) {
case TRANSPORT_WATER:
colour = PC_WATER;
break;
case TRANSPORT_RAIL:
colour = GetRailTypeInfo(GetRailType(tile))->map_colour;
break;
case TRANSPORT_ROAD: {
const RoadTypeInfo *rti = nullptr;
if (GetRoadTypeRoad(tile) != INVALID_ROADTYPE) {
rti = GetRoadTypeInfo(GetRoadTypeRoad(tile));
} else {
rti = GetRoadTypeInfo(GetRoadTypeTram(tile));
}
if (rti != nullptr) {
colour = rti->map_colour;
break;
}
FALLTHROUGH;
}
default:
colour = PC_BLACK;
break;
}
} else { } else {
colour = is_tunnel ? PC_BLACK : PC_VERY_LIGHT_YELLOW; colour = is_tunnel ? PC_BLACK : PC_VERY_LIGHT_YELLOW;
} }