dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: replace magic numbers and C-style arrays with C++-style array for share owners

Browse Source
This commit is contained in:
Rubidium
2022-02-02 22:34:22 +01:00
committed by rubidium42
parent 2bfceea762
commit c73f578e8c
7 changed files with 54 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/company_gui.cpp
View File

@@ -2195,10 +2195,8 @@ static const NWidgetPart _nested_company_widgets[] = {
int GetAmountOwnedBy(const Company *c, Owner owner)
{
return (c->share_owners[0] == owner) +
(c->share_owners[1] == owner) +
(c->share_owners[2] == owner) +
(c->share_owners[3] == owner);
auto share_owned_by = [owner](auto share_owner) { return share_owner == owner; };
return std::count_if(c->share_owners.begin(), c->share_owners.end(), share_owned_by);
}
/** Strings for the company vehicle counts */
@@ -2275,13 +2273,8 @@ struct CompanyWindow : Window
}
/* Owners of company */
plane = SZSP_HORIZONTAL;
for (uint i = 0; i < lengthof(c->share_owners); i++) {
if (c->share_owners[i] != INVALID_COMPANY) {
plane = 0;
break;
}
}
auto invalid_owner = [](auto owner) { return owner == INVALID_COMPANY; };
plane = std::all_of(c->share_owners.begin(), c->share_owners.end(), invalid_owner) ? SZSP_HORIZONTAL : 0;
wi = this->GetWidget<NWidgetStacked>(WID_C_SELECT_DESC_OWNERS);
if (plane != wi->shown_plane) {
wi->SetDisplayedPlane(plane);