Change: Increase maximum number of orders from 64000 to ~16.7m. #7220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
glx22
reviewed
Feb 11, 2019
| @@ -25,7 +25,7 @@ static const VehicleOrderID INVALID_VEH_ORDER_ID = 0xFF; | |||
| static const VehicleOrderID MAX_VEH_ORDER_ID = INVALID_VEH_ORDER_ID - 1; | |||
|
|
|||
| /** Invalid order (sentinel) */ | |||
| static const OrderID INVALID_ORDER = 0xFFFF; | |||
| static const OrderID INVALID_ORDER = 0xFFFFFF; | |||
There was a problem hiding this comment.
Doesn't this change require conversion on load ?
There was a problem hiding this comment.
Orders are stored as references which already does the magic. See 1fa98e1 for a similar change, 9 years ago :-)
There would also be an issue if OrderID was passed in commands, but it seems VehicleOrderIDs are used instead.
LordAro
approved these changes
Feb 12, 2019
|
What about merging this one? |
|
If this pull request is merged, the following limits and stats will change:
|
nielsmh
pushed a commit
to nielsmh/OpenTTD
that referenced
this pull request
Mar 11, 2019
douiwby
pushed a commit
to douiwby/OpenTTD
that referenced
this pull request
Apr 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #6968. Turns out it is apparently trivial to increase the maximum number of orders, and doesn't even need a bump, though #7219 is useful in that case.