miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Use std::initializer_list for NWidgetPart data. (#14749)

Browse Source 
Avoids using C/C++ arrays.
This commit is contained in:
Peter Nelson
2025-11-01 22:33:00 +00:00
committed by dP
parent 49dd74ea89
commit c2d92433c6
62 changed files with 160 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/town_gui.cpp
+6 -6
View File
@@ -68,7 +68,7 @@ TownKdtree _town_local_authority_kdtree{};
typedef GUIList<const Town*, const bool &> GUITownList;
static constexpr NWidgetPart _nested_town_authority_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_town_authority_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TA_CAPTION),
@@ -673,7 +673,7 @@ public:
}};
};
static constexpr NWidgetPart _nested_town_game_view_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_town_game_view_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetAspect(WidgetDimensions::ASPECT_RENAME), SetSpriteTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
@@ -706,7 +706,7 @@ static WindowDesc _town_game_view_desc(
&TownViewWindow::hotkeys
);
static constexpr NWidgetPart _nested_town_editor_view_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_town_editor_view_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetAspect(WidgetDimensions::ASPECT_RENAME), SetSpriteTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
@@ -751,7 +751,7 @@ void ShowTownViewWindow(TownID town)
}
}
static constexpr NWidgetPart _nested_town_directory_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_town_directory_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TD_CAPTION), SetStringTip(CM_STR_TOWN_DIRECTORY_CAPTION_EXTRA, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -1167,7 +1167,7 @@ void CcFoundRandomTown(Commands, const CommandCost &result, Money, TownID town_i
if (result.Succeeded()) ScrollMainWindowToTile(Town::Get(town_id)->xy);
}
static constexpr NWidgetPart _nested_found_town_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_found_town_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN),
NWidget(WWT_CAPTION, COLOUR_DARK_GREEN), SetStringTip(STR_FOUND_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -1906,7 +1906,7 @@ struct BuildHouseWindow : public PickerWindow {
};
/** Nested widget definition for the build NewGRF rail waypoint window */
static constexpr NWidgetPart _nested_build_house_widgets[] = {
static constexpr std::initializer_list<NWidgetPart> _nested_build_house_widgets = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN),
NWidget(WWT_CAPTION, COLOUR_DARK_GREEN), SetStringTip(STR_HOUSE_PICKER_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),