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

Fix: keep NewGRF order for object class sorting #8818

Merged
merged 1 commit into from Mar 8, 2021

Conversation

perezdidac
Copy link
Contributor

Motivation / Problem

A filter for objects was added in #8603, but the change also made the object class list to be sorted alphabetical. This adds some value but breaks others as stated in #8817.

Description

This change modifies the logic to sort the list of object classes to keep the order of the NewGRF list. See:

image

Note that since the code was based on using ObjectClass pointer rather than ObjectClassID, I am also reverting to use ObjectClassID back as before of #8603 as it's needed to sort.

I will apply the same sorting logic to #8706.

Limitations

None.

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 affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@stormcone
Copy link
Contributor

What do you think about a drop down menu where you can select the sort order? Similar to other places, like the build vehicle menu.

@perezdidac
Copy link
Contributor Author

What do you think about a drop down menu where you can select the sort order? Similar to other places, like the build vehicle menu.

Yes, I like the idea if I can do it without clogging the UI too much. This will require some more changes so better doing it in a separate PR so we can merge this fix into 1.11 first to not break current use cases. WDYT?

@stormcone
Copy link
Contributor

It's fine for me. :)

@TrueBrain TrueBrain added this to the 1.11.0 milestone Mar 8, 2021
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

LGTM

@TrueBrain TrueBrain merged commit 3878c47 into OpenTTD:master Mar 8, 2021
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

4 participants