Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2024-04-11 13:24:33 +07:00
43 changed files with 805 additions and 625 deletions

View File

@@ -1214,9 +1214,11 @@ private:
const RoadStopSpec *spec = RoadStopClass::Get(_roadstop_gui_settings.roadstop_class)->GetSpec(_roadstop_gui_settings.roadstop_type);
/* Raise and lower to ensure the correct widget is lowered after changing displayed orientation plane. */
this->RaiseWidget(WID_BROS_STATION_NE + _roadstop_gui_settings.orientation);
this->GetWidget<NWidgetStacked>(WID_BROS_AVAILABLE_ORIENTATIONS)->SetDisplayedPlane((spec != nullptr && HasBit(spec->flags, RSF_DRIVE_THROUGH_ONLY)) ? 1 : 0);
this->LowerWidget(WID_BROS_STATION_NE + _roadstop_gui_settings.orientation);
if (RoadTypeIsRoad(_cur_roadtype)) {
this->RaiseWidget(WID_BROS_STATION_NE + _roadstop_gui_settings.orientation);
this->GetWidget<NWidgetStacked>(WID_BROS_AVAILABLE_ORIENTATIONS)->SetDisplayedPlane((spec != nullptr && HasBit(spec->flags, RSF_DRIVE_THROUGH_ONLY)) ? 1 : 0);
this->LowerWidget(WID_BROS_STATION_NE + _roadstop_gui_settings.orientation);
}
if (_roadstop_gui_settings.orientation >= DIAGDIR_END) return;