mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Simplify logic for determining road tile colour in 'Routes' mode of small map.

pull/13971/head
SamuXarick 2025-04-06 10:02:24 +01:00
parent bc78efeec1
commit c5c0e88916
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/smallmap_gui.cpp
View File

@ -463,7 +463,7 @@ static inline uint32_t GetSmallMapIndustriesPixels(TileIndex tile, TileType t)
* *
* @param tile The tile of which we would like to get the colour. * @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #SmallMapWindow::GetTileColours). * @param t Effective tile type of the tile (see #SmallMapWindow::GetTileColours).
* @return The colour of tile in the small map in mode "Routes" * @return The colour of tile in the small map in mode "Routes"
*/ */
static inline uint32_t GetSmallMapRoutesPixels(TileIndex tile, TileType t) static inline uint32_t GetSmallMapRoutesPixels(TileIndex tile, TileType t)
{ {
@ -489,22 +489,15 @@ static inline uint32_t GetSmallMapRoutesPixels(TileIndex tile, TileType t)
} }
case MP_ROAD: { case MP_ROAD: {
const RoadTypeInfo *rti = nullptr; RoadType rt_road = GetRoadTypeRoad(tile);
if (GetRoadTypeRoad(tile) != INVALID_ROADTYPE) {
rti = GetRoadTypeInfo(GetRoadTypeRoad(tile));
} else {
rti = GetRoadTypeInfo(GetRoadTypeTram(tile));
}
if (rti != nullptr) {
AndOr andor = {
MKCOLOUR_0XX0(rti->map_colour),
_smallmap_contours_andor[t].mand
};
const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour]; AndOr andor = {
return ApplyMask(cs->default_colour, &andor); MKCOLOUR_0XX0(GetRoadTypeInfo(rt_road != INVALID_ROADTYPE ? rt_road : GetRoadTypeTram(tile))->map_colour),
} _smallmap_contours_andor[t].mand
[[fallthrough]]; };
const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour];
return ApplyMask(cs->default_colour, &andor);
} }
default: default: