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

Change: Increase house type limit to 4096. #12288

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Mar 12, 2024

Motivation / Problem

The house limit of 512 is quite arbitrary and can be reached quite easily. There is plenty of free bits available to houses in the map array to increase this limit.

Description

Increase the house type limit to 4096, moving map storing from 9 bits of m4+m3[6] to 12 bits of m8.

This requires a savegame bump for map conversion.

Built on top of #12287 which makes HouseSpec allocation dynamic.

Limitations

Variable 0x66 stores the local id in 8 bits, so any local id higher than 0xFF will be indistinguishable from 0xFF.

Why limit to 4096? No particular reason, 65535 would also be fine, using all of m8.

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

@PeterN PeterN changed the title House limit Change: Increase house type limit to 4096. Mar 12, 2024
rubidium42
rubidium42 previously approved these changes Mar 24, 2024
@PeterN
Copy link
Member Author

PeterN commented Mar 25, 2024

Looks like HouseScopeResolver variable 0x66 was written with the limit of 255 houses per NewGRF in mind, so that'll be broken :/

This moves HouseType from m4+m3[6] to m8.
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