diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index de467e0a5c..abc2ba3f54 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -261,8 +261,6 @@ public: this->FinishInitNested(TRANSPORT_AIR); - this->SetWidgetLoweredState(WID_AP_BTN_DONTHILIGHT, !_settings_client.gui.station_show_coverage); - this->SetWidgetLoweredState(WID_AP_BTN_DOHILIGHT, _settings_client.gui.station_show_coverage); this->OnInvalidateData(); /* Ensure airport class is valid (changing NewGRFs). */ @@ -485,7 +483,7 @@ public: this->SetWidgetDisabledState(WID_AP_LAYOUT_INCREASE, _selected_airport_layout + 1U >= as->layouts.size()); int rad = _settings_game.station.modified_catchment ? as->catchment : (uint)CA_UNMODIFIED; - if (_settings_client.gui.station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); + SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); } } @@ -504,16 +502,6 @@ public: break; } - case WID_AP_BTN_DONTHILIGHT: case WID_AP_BTN_DOHILIGHT: - _settings_client.gui.station_show_coverage = (widget != WID_AP_BTN_DONTHILIGHT); - this->SetWidgetLoweredState(WID_AP_BTN_DONTHILIGHT, !_settings_client.gui.station_show_coverage); - this->SetWidgetLoweredState(WID_AP_BTN_DOHILIGHT, _settings_client.gui.station_show_coverage); - this->SetDirty(); - if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP); - this->UpdateSelectSize(); - SetViewportCatchmentStation(nullptr, true); - break; - case WID_AP_LAYOUT_DECREASE: _selected_airport_layout--; this->UpdateSelectSize(); @@ -602,15 +590,6 @@ static constexpr NWidgetPart _nested_build_airport_widgets[] = { NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_AP_LAYOUT_INCREASE), SetMinimalSize(12, 0), SetArrowWidgetTypeTip(AWV_INCREASE), EndContainer(), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_AP_EXTRA_TEXT), SetFill(1, 0), SetMinimalSize(150, 0), - NWidget(WWT_LABEL, INVALID_COLOUR), SetStringTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE), SetFill(1, 0), - NWidget(NWID_HORIZONTAL), SetPIP(14, 0, 14), SetPIPRatio(1, 0, 1), - NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_AP_BTN_DONTHILIGHT), SetMinimalSize(60, 12), SetFill(1, 0), - SetStringTip(STR_STATION_BUILD_COVERAGE_OFF, STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_AP_BTN_DOHILIGHT), SetMinimalSize(60, 12), SetFill(1, 0), - SetStringTip(STR_STATION_BUILD_COVERAGE_ON, STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP), - EndContainer(), - EndContainer(), EndContainer(), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_AP_ACCEPTANCE), SetResize(0, 1), SetFill(1, 0), SetMinimalTextLines(2, WidgetDimensions::unscaled.vsep_normal), EndContainer(), diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index 68f3959e90..542a8f08ce 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -415,9 +415,6 @@ Window *ShowBuildDocksScenToolbar() /** Widget numbers of the build-dock GUI. */ enum BuildDockStationWidgets { BDSW_BACKGROUND, ///< Background panel. - BDSW_LT_OFF, ///< 'Off' button of coverage high light. - BDSW_LT_ON, ///< 'On' button of coverage high light. - BDSW_INFO, ///< 'Coverage highlight' label. BDSW_ACCEPTANCE, ///< Acceptance info. }; @@ -426,7 +423,6 @@ public: BuildDocksStationWindow(WindowDesc &desc, Window *parent) : PickerWindowBase(desc, parent) { this->InitNested(TRANSPORT_WATER); - this->LowerWidget(_settings_client.gui.station_show_coverage + BDSW_LT_OFF); } void Close([[maybe_unused]] int data = 0) override @@ -441,11 +437,7 @@ public: this->DrawWidgets(); - if (_settings_client.gui.station_show_coverage) { - SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); - } else { - SetTileSelectSize(1, 1); - } + SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); /* strings such as 'Size' and 'Coverage Area' */ Rect r = this->GetWidget(BDSW_ACCEPTANCE)->GetCurrentRect(); @@ -461,21 +453,6 @@ public: } } - void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override - { - switch (widget) { - case BDSW_LT_OFF: - case BDSW_LT_ON: - this->RaiseWidget(_settings_client.gui.station_show_coverage + BDSW_LT_OFF); - _settings_client.gui.station_show_coverage = (widget != BDSW_LT_OFF); - this->LowerWidget(_settings_client.gui.station_show_coverage + BDSW_LT_OFF); - if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP); - this->SetDirty(); - SetViewportCatchmentStation(nullptr, true); - break; - } - } - void OnRealtimeTick([[maybe_unused]] uint delta_ms) override { CheckRedrawStationCoverage(this); @@ -494,14 +471,7 @@ static constexpr NWidgetPart _nested_build_dock_station_widgets[] = { EndContainer(), NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BDSW_BACKGROUND), NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0), SetPadding(WidgetDimensions::unscaled.picker), - NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_picker, 0), - NWidget(WWT_LABEL, INVALID_COLOUR, BDSW_INFO), SetStringTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE), SetFill(1, 0), - NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(14, 0, 14), - NWidget(WWT_TEXTBTN, COLOUR_GREY, BDSW_LT_OFF), SetMinimalSize(60, 12), SetFill(1, 0), SetStringTip(STR_STATION_BUILD_COVERAGE_OFF, STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, BDSW_LT_ON), SetMinimalSize(60, 12), SetFill(1, 0), SetStringTip(STR_STATION_BUILD_COVERAGE_ON, STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP), - EndContainer(), - EndContainer(), - NWidget(WWT_EMPTY, INVALID_COLOUR, BDSW_ACCEPTANCE), SetResize(0, 1), SetMinimalTextLines(2, WidgetDimensions::unscaled.vsep_normal), + NWidget(WWT_EMPTY, INVALID_COLOUR, BDSW_ACCEPTANCE), SetResize(0, 1), SetMinimalTextLines(2, WidgetDimensions::unscaled.vsep_normal), SetMinimalSize(150, 0), EndContainer(), EndContainer(), }; diff --git a/src/lang/english.txt b/src/lang/english.txt index 41531939f3..5498f0260f 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2757,11 +2757,6 @@ STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Average travel time: {UNITS_DAYS_OR_SECONDS} # Base for station construction window(s) -STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Coverage area highlight -STR_STATION_BUILD_COVERAGE_OFF :{BLACK}Off -STR_STATION_BUILD_COVERAGE_ON :{BLACK}On -STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't highlight coverage area of proposed site -STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} STR_STATION_BUILD_INFRASTRUCTURE_COST_YEAR :{BLACK}Maintenance cost: {GOLD}{CURRENCY_SHORT}/year diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 291039204a..c08dfda873 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1102,8 +1102,6 @@ public: this->LowerWidget(WID_BRAS_PLATFORM_NUM_BEGIN + _settings_client.gui.station_numtracks); this->LowerWidget(WID_BRAS_PLATFORM_LEN_BEGIN + _settings_client.gui.station_platlength); } - this->SetWidgetLoweredState(WID_BRAS_HIGHLIGHT_OFF, !_settings_client.gui.station_show_coverage); - this->SetWidgetLoweredState(WID_BRAS_HIGHLIGHT_ON, _settings_client.gui.station_show_coverage); this->PickerWindow::OnInit(); } @@ -1141,7 +1139,7 @@ public: int rad = (_settings_game.station.modified_catchment) ? CA_TRAIN : CA_UNMODIFIED; - if (_settings_client.gui.station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); + SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); for (uint bits = 0; bits < 7; bits++) { bool disable = bits >= _settings_game.station.station_spread; @@ -1344,17 +1342,6 @@ public: break; } - case WID_BRAS_HIGHLIGHT_OFF: - case WID_BRAS_HIGHLIGHT_ON: - _settings_client.gui.station_show_coverage = (widget != WID_BRAS_HIGHLIGHT_OFF); - - this->SetWidgetLoweredState(WID_BRAS_HIGHLIGHT_OFF, !_settings_client.gui.station_show_coverage); - this->SetWidgetLoweredState(WID_BRAS_HIGHLIGHT_ON, _settings_client.gui.station_show_coverage); - if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP); - this->SetDirty(); - SetViewportCatchmentStation(nullptr, true); - break; - default: this->PickerWindow::OnClick(pt, widget, click_count); break; @@ -1424,11 +1411,6 @@ static constexpr NWidgetPart _nested_station_builder_widgets[] = { NWidget(NWID_HORIZONTAL), SetPIPRatio(1, 0, 1), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BRAS_PLATFORM_DRAG_N_DROP), SetMinimalSize(75, 12), SetStringTip(STR_STATION_BUILD_DRAG_DROP, STR_STATION_BUILD_DRAG_DROP_TOOLTIP), EndContainer(), - NWidget(WWT_LABEL, INVALID_COLOUR), SetStringTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE), SetFill(1, 0), - NWidget(NWID_HORIZONTAL), SetPIPRatio(1, 0, 1), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BRAS_HIGHLIGHT_OFF), SetMinimalSize(60, 12), SetStringTip(STR_STATION_BUILD_COVERAGE_OFF, STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BRAS_HIGHLIGHT_ON), SetMinimalSize(60, 12), SetStringTip(STR_STATION_BUILD_COVERAGE_ON, STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP), - EndContainer(), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BRAS_COVERAGE_TEXTS), SetFill(1, 1), SetResize(1, 0), SetMinimalTextLines(2, 0), EndContainer(), EndContainer(), diff --git a/src/road_gui.cpp b/src/road_gui.cpp index d53b21668d..19934666ba 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -1342,7 +1342,6 @@ public: } this->LowerWidget(WID_BROS_STATION_NE + _roadstop_gui.orientation); - this->LowerWidget(WID_BROS_LT_OFF + _settings_client.gui.station_show_coverage); this->window_class = (rs == RoadStopType::Bus) ? WC_BUS_STATION : WC_TRUCK_STATION; } @@ -1369,11 +1368,7 @@ public: this->DrawWidgets(); int rad = _settings_game.station.modified_catchment ? ((this->window_class == WC_BUS_STATION) ? CA_BUS : CA_TRUCK) : CA_UNMODIFIED; - if (_settings_client.gui.station_show_coverage) { - SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); - } else { - SetTileSelectSize(1, 1); - } + SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); if (this->IsShaded()) return; @@ -1482,16 +1477,6 @@ public: CloseWindowById(WC_SELECT_STATION, 0); break; - case WID_BROS_LT_OFF: - case WID_BROS_LT_ON: - this->RaiseWidget(_settings_client.gui.station_show_coverage + WID_BROS_LT_OFF); - _settings_client.gui.station_show_coverage = (widget != WID_BROS_LT_OFF); - this->LowerWidget(_settings_client.gui.station_show_coverage + WID_BROS_LT_OFF); - if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP); - this->SetDirty(); - SetViewportCatchmentStation(nullptr, true); - break; - default: this->PickerWindow::OnClick(pt, widget, click_count); break; @@ -1551,13 +1536,6 @@ static constexpr NWidgetPart _nested_road_station_picker_widgets[] = { EndContainer(), EndContainer(), EndContainer(), - NWidget(WWT_LABEL, INVALID_COLOUR), SetStringTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE), SetFill(1, 0), - NWidget(NWID_HORIZONTAL), SetPIPRatio(1, 0, 1), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_LT_OFF), SetMinimalSize(60, 12), - SetStringTip(STR_STATION_BUILD_COVERAGE_OFF, STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_LT_ON), SetMinimalSize(60, 12), - SetStringTip(STR_STATION_BUILD_COVERAGE_ON, STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP), - EndContainer(), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BROS_ACCEPTANCE), SetFill(1, 1), SetResize(1, 0), SetMinimalTextLines(2, 0), EndContainer(), EndContainer(), @@ -1591,13 +1569,6 @@ static constexpr NWidgetPart _nested_tram_station_picker_widgets[] = { NWidget(WWT_PANEL, COLOUR_GREY, WID_BROS_STATION_X), SetFill(0, 0), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_BROS_STATION_Y), SetFill(0, 0), EndContainer(), EndContainer(), - NWidget(WWT_LABEL, INVALID_COLOUR), SetStringTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE), SetFill(1, 0), - NWidget(NWID_HORIZONTAL), SetPIPRatio(1, 0, 1), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_LT_OFF), SetMinimalSize(60, 12), - SetStringTip(STR_STATION_BUILD_COVERAGE_OFF, STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_LT_ON), SetMinimalSize(60, 12), - SetStringTip(STR_STATION_BUILD_COVERAGE_ON, STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP), - EndContainer(), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BROS_ACCEPTANCE), SetFill(1, 1), SetResize(1, 0), SetMinimalTextLines(2, 0), EndContainer(), EndContainer(), diff --git a/src/settings_type.h b/src/settings_type.h index 255038e537..6ee4c8864f 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -201,7 +201,6 @@ struct GUISettings { uint8_t station_numtracks; ///< the number of platforms to default on for rail stations uint8_t station_platlength; ///< the platform length, in tiles, for rail stations bool station_dragdrop; ///< whether drag and drop is enabled for stations - bool station_show_coverage; ///< whether to highlight coverage area bool persistent_buildingtools; ///< keep the building tools active after usage bool expenses_layout; ///< layout of expenses window uint32_t last_newgrf_count; ///< the numbers of NewGRFs we found during the last scan diff --git a/src/station_gui.cpp b/src/station_gui.cpp index f3b1b1aacd..23943d245e 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -168,7 +168,7 @@ void CheckRedrawStationCoverage(const Window *w) _thd.dirty &= ~1; w->SetDirty(); - if (_settings_client.gui.station_show_coverage && _thd.drawstyle == HT_RECT) { + if (_thd.drawstyle == HT_RECT) { FindStationsAroundSelection(); } } diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini index 3d9ee1b75b..375083433c 100644 --- a/src/table/settings/gui_settings.ini +++ b/src/table/settings/gui_settings.ini @@ -691,12 +691,6 @@ flags = SettingFlag::NotInSave, SettingFlag::NoNetworkSync def = true cat = SC_BASIC -[SDTC_BOOL] -var = gui.station_show_coverage -flags = SettingFlag::NotInSave, SettingFlag::NoNetworkSync -def = false -cat = SC_BASIC - [SDTC_BOOL] var = gui.persistent_buildingtools flags = SettingFlag::NotInSave, SettingFlag::NoNetworkSync diff --git a/src/widgets/airport_widget.h b/src/widgets/airport_widget.h index 4e16f4596e..7da766fad1 100644 --- a/src/widgets/airport_widget.h +++ b/src/widgets/airport_widget.h @@ -28,9 +28,6 @@ enum AirportPickerWidgets : WidgetID { WID_AP_LAYOUT_INCREASE, ///< Increase the layout number. WID_AP_AIRPORT_SPRITE, ///< A visual display of the airport currently selected. WID_AP_EXTRA_TEXT, ///< Additional text about the airport. - WID_AP_COVERAGE_LABEL, ///< Label if you want to see the coverage. - WID_AP_BTN_DONTHILIGHT, ///< Don't show the coverage button. - WID_AP_BTN_DOHILIGHT, ///< Show the coverage button. WID_AP_ACCEPTANCE, ///< Acceptance info. }; diff --git a/src/widgets/rail_widget.h b/src/widgets/rail_widget.h index f290d80162..3e4ed4413d 100644 --- a/src/widgets/rail_widget.h +++ b/src/widgets/rail_widget.h @@ -56,8 +56,6 @@ enum BuildRailStationWidgets : WidgetID { WID_BRAS_PLATFORM_DRAG_N_DROP, ///< Button to enable drag and drop type station placement. - WID_BRAS_HIGHLIGHT_OFF, ///< Button for turning coverage highlighting off. - WID_BRAS_HIGHLIGHT_ON, ///< Button for turning coverage highlighting on. WID_BRAS_COVERAGE_TEXTS, ///< Empty space for the coverage texts. WID_BRAS_PLATFORM_NUM_BEGIN = WID_BRAS_PLATFORM_NUM_1 - 1, ///< Helper for determining the chosen platform width.