Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codechange: Use a few less NUM_CARGO loops. #11499

Merged
merged 2 commits into from Nov 28, 2023

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Nov 26, 2023

Motivation / Problem

Reducing the use of 0 - NUM_CARGO loops. for-loops that index into an array which can use range-for or std::max_element.

Description

Replace some loops with range-for or std::max_element.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

Comment on lines 1375 to 1379
int r = 0;
for (CargoID i = 0; i < NUM_CARGO; i++) {
r = diff[i];
for (uint d : diff) {
r = d;
if (r != 0) break;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't this be something along the line of the following?

auto it = std::find_if(diff.begin(), diff.end(), [](auto d) { return d != 0; });
return it != diff.end() ? *it < 0 : VehicleNumberSorter(a, b);

It's sort of a recurring pattern with the capacities as well, though there the code is smaller than it's here.

@PeterN PeterN merged commit 7b0afec into OpenTTD:master Nov 28, 2023
19 checks passed
@PeterN PeterN deleted the less-num-cargo branch November 28, 2023 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants