From 8770ef6bd9ae620b662463af64b23436f44b7a4c Mon Sep 17 00:00:00 2001 From: Richard Wheeler <2762690+zephyris@users.noreply.github.com> Date: Sat, 27 Jan 2024 09:25:13 +0000 Subject: [PATCH] Change: Make street lights transparent with houses (#11828) --- src/road_cmd.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 69f540d43d..ffaf3e5cad 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -1665,8 +1665,18 @@ static void DrawRoadBits(TileInfo *ti) /* If there are no road bits, return, as there is nothing left to do */ if (HasAtMostOneBit(road)) return; + /* Do not draw details when invisible. */ if (roadside == ROADSIDE_TREES && IsInvisibilitySet(TO_TREES)) return; - bool is_transparent = roadside == ROADSIDE_TREES && IsTransparencySet(TO_TREES); + if (roadside == ROADSIDE_STREET_LIGHTS && IsInvisibilitySet(TO_HOUSES)) return; + + /* Check whether details should be transparent. */ + bool is_transparent = false; + if (roadside == ROADSIDE_TREES && IsTransparencySet(TO_TREES)) { + is_transparent = true; + } + if (roadside == ROADSIDE_STREET_LIGHTS && IsTransparencySet(TO_HOUSES)) { + is_transparent = true; + } /* Draw extra details. */ for (const DrawRoadTileStruct *drts = _road_display_table[roadside][road | tram]; drts->image != 0; drts++) {