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

Cleanup: Use std::vector in xxxSpriteGroups. #9172

merged 5 commits into from May 2, 2021


Copy link

@PeterN PeterN commented May 1, 2021

Motivation / Problem

Loading of some types of "sprite groups" requires reading into temporary vectors and then copying to C-style arrays, along with requiring extra code on deletion.


This change skips the temporary structures and uses vectors directly in the sprite groups. This avoids additional properties to store the size and memory management.


Performance has not been evaluated.

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')

src/newgrf.cpp Outdated Show resolved Hide resolved
src/newgrf_spritegroup.cpp Outdated Show resolved Hide resolved
PeterN added 2 commits May 2, 2021 09:18
Previously noted by a comment, this does not need to be guarded against as non-powers of 2 will not cause issues beyond the choice of results being reduced.
@PeterN PeterN changed the title Cleanup: Use std::vector is xxxSpriteGroups. Cleanup: Use std::vector in xxxSpriteGroups. May 2, 2021
@PeterN PeterN merged commit 18fb1c3 into OpenTTD:master May 2, 2021
@PeterN PeterN deleted the more-vectors branch May 2, 2021 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet

Successfully merging this pull request may close these issues.

None yet

2 participants