From 2b9c94f55a62cf35cea21a84950bc4d1de409d72 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 15 Mar 2025 09:20:47 +0100 Subject: [PATCH] Fix: don't show owner of non-existent road --- src/smallmap_gui.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index c4453442ee..e8ef37c65f 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -585,11 +585,13 @@ uint32_t GetSmallMapOwnerPixels(TileIndex tile, TileType t, IncludeHeightmap inc case MP_VOID: return MKCOLOUR_XXXX(PC_BLACK); case MP_INDUSTRY: return MKCOLOUR_XXXX(PC_DARK_GREY); case MP_HOUSE: return MKCOLOUR_XXXX(PC_DARK_RED); - default: o = GetTileOwner(tile); break; - /* FIXME: For MP_ROAD there are multiple owners. - * GetTileOwner returns the rail owner (level crossing) resp. the owner of ROADTYPE_ROAD (normal road), - * even if there are no ROADTYPE_ROAD bits on the tile. - */ + case MP_ROAD: + o = GetRoadOwner(tile, HasRoadTypeRoad(tile) ? RTT_ROAD : RTT_TRAM); + break; + + default: + o = GetTileOwner(tile); + break; } if ((o < MAX_COMPANIES && !_legend_land_owners[_company_to_list_pos[o]].show_on_map) || o == OWNER_NONE || o == OWNER_WATER) {