Codechange: Use CompanyMask to pass Companies to PopupMainCompanyToolbMenu().

It's like the type was designed for it.
This commit is contained in:
Peter Nelson 2024-01-05 21:50:37 +00:00 committed by Peter Nelson
parent 6828b6014a
commit 06a5fa6239

View File

@ -145,9 +145,9 @@ static const int CTMN_SPECTATOR = -3; ///< Show a company window as spectator
* Pop up a generic company list menu. * Pop up a generic company list menu.
* @param w The toolbar window. * @param w The toolbar window.
* @param widget The button widget id. * @param widget The button widget id.
* @param grey A bitbask of which items to mark as disabled. * @param grey A bitmask of which companies to mark as disabled.
*/ */
static void PopupMainCompanyToolbMenu(Window *w, WidgetID widget, int grey = 0) static void PopupMainCompanyToolbMenu(Window *w, WidgetID widget, CompanyMask grey = 0)
{ {
DropDownList list; DropDownList list;
@ -728,7 +728,7 @@ static CallBackFunction MenuClickIndustry(int index)
static void ToolbarVehicleClick(Window *w, VehicleType veh) static void ToolbarVehicleClick(Window *w, VehicleType veh)
{ {
int dis = 0; CompanyMask dis = 0;
for (const Company *c : Company::Iterate()) { for (const Company *c : Company::Iterate()) {
if (c->group_all[veh].num_vehicle == 0) SetBit(dis, c->index); if (c->group_all[veh].num_vehicle == 0) SetBit(dis, c->index);