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: Support more than 256 stations/waypoints/roadstops per class. #10793

Merged
merged 2 commits into from
May 8, 2023

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented May 8, 2023

Motivation / Problem

It was already possible to define more than 256 per class, but not possible to use them as the index used in GUI and passed through commands was limited to a byte.

Objects are handled differently, by passing a global instead of class & class index, so do not have the same issue.

Loading lots of NewGRFs could cause more than 256 specs to be defined per class. This would then wrap around in the UI and now allow use of all specs.

468 waypoints are loaded, but only 256 are visible.

Screenshot 2023-05-08 181227

Description

Change the index to be uint16_t instead of a byte. While 65536 may be reachable it's not a problematic limit currently.

Same set of NewGRFs are loading which gives 468 waypoints:

Screenshot 2023-05-08 180950

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, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

It was already possible to define more than 256 per class, but not possible
to use them as the index used in GUI and passed through commands was limited
to a byte.
src/rail_gui.cpp Outdated Show resolved Hide resolved
@PeterN PeterN enabled auto-merge (squash) May 8, 2023 18:01
@PeterN PeterN merged commit 882f06b into OpenTTD:master May 8, 2023
19 checks passed
@PeterN PeterN deleted the newgrf-classes-spec-limit branch May 8, 2023 18:14
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

3 participants