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 #6803: CargoMonitorID bit packing updated to handle 64 cargo types. #7175

Merged
merged 1 commit into from Feb 4, 2019

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Feb 4, 2019

In the update from 32 to 64 cargo types, the bit packing used by CargoMonitorID was not updated, so cargo types beyond 32 could not be monitored. This is fitted in by moving cargo type down into a free bit.

assert_compile()s added for sanity.

This requires a saveload bump to change the bitpacking on loading older saves.

@PeterN PeterN force-pushed the cargomonitor-bit-packing-fix branch from 09a02f4 to 338deed Compare Feb 4, 2019
LordAro
LordAro previously approved these changes Feb 4, 2019
Copy link
Member

@LordAro LordAro left a comment

All the savegame bumps. Looks fine once the conflict has been resolved though

…go types.

This requires a saveload bump to change the bitpacking on loading older saves.
LordAro
LordAro approved these changes Feb 4, 2019
@LordAro LordAro merged commit 6487832 into OpenTTD:master Feb 4, 2019
1 check passed
@PeterN PeterN deleted the cargomonitor-bit-packing-fix branch Feb 4, 2019
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