petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix #11087: Disable base graphics/sound dropdown outside main menu

Browse Source
This commit is contained in:
merni-ns
2023-07-01 17:27:06 +05:30
committed by rubidium42
parent 4ae9ebf582
commit 161cc04b8a
3 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/settings_gui.cpp
View File

@@ -74,25 +74,6 @@ static uint GetCurrentResolutionIndex()
static void ShowCustCurrency();
template <class T>
static DropDownList BuildSetDropDownList(int *selected_index, bool allow_selection)
{
int n = T::GetNumSets();
*selected_index = T::GetIndexOfUsedSet();
DropDownList list;
for (int i = 0; i < n; i++) {
list.emplace_back(new DropDownListStringItem(T::GetSet(i)->name, i, !allow_selection && (*selected_index != i)));
}
return list;
}
DropDownList BuildMusicSetDropDownList(int *selected_index)
{
return BuildSetDropDownList<BaseMusic>(selected_index, true);
}
/** Window for displaying the textfile of a BaseSet. */
template <class TBaseSet>
struct BaseSetTextfileWindow : public TextfileWindow {
@@ -291,15 +272,15 @@ struct GameOptionsWindow : Window {
break;
case WID_GO_BASE_GRF_DROPDOWN:
list = BuildSetDropDownList<BaseGraphics>(selected_index, (_game_mode == GM_MENU));
list = BuildSetDropDownList<BaseGraphics>(selected_index);
break;
case WID_GO_BASE_SFX_DROPDOWN:
list = BuildSetDropDownList<BaseSounds>(selected_index, (_game_mode == GM_MENU));
list = BuildSetDropDownList<BaseSounds>(selected_index);
break;
case WID_GO_BASE_MUSIC_DROPDOWN:
list = BuildMusicSetDropDownList(selected_index);
list = BuildSetDropDownList<BaseMusic>(selected_index);
break;
}
@@ -740,6 +721,9 @@ struct GameOptionsWindow : Window {
this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, _gui_scale_cfg == -1);
this->SetWidgetLoweredState(WID_GO_GUI_SCALE_BEVEL_BUTTON, _settings_client.gui.scale_bevels);
this->SetWidgetDisabledState(WID_GO_BASE_GRF_DROPDOWN, _game_mode != GM_MENU);
this->SetWidgetDisabledState(WID_GO_BASE_SFX_DROPDOWN, _game_mode != GM_MENU);
bool missing_files = BaseGraphics::GetUsedSet()->GetNumMissing() == 0;
this->GetWidget<NWidgetCore>(WID_GO_BASE_GRF_STATUS)->SetDataTip(missing_files ? STR_EMPTY : STR_GAME_OPTIONS_BASE_GRF_STATUS, STR_NULL);