Fix vehicle orders not being deleted correctly when deallocating a station#3393
Merged
duncanspumpkin merged 5 commits intoOpenLoco:masterfrom Nov 10, 2025
Merged
Conversation
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
| && i < head->orderTableOffset + head->sizeOfOrderTable) | ||
| { | ||
| deleteOrder(head, i); | ||
| deleteOrder(head, i - head->orderTableOffset); |
Member
There was a problem hiding this comment.
This does not look correct to me. deleteOrder gets passed the vehicle head, so it should account for the order table offset already.
Contributor
Author
There was a problem hiding this comment.
One would think, but it looks like it actually adds it
OpenLoco/src/OpenLoco/src/Vehicles/OrderManager.cpp
Lines 205 to 212 in 22b8f5c
Member
AaronVanGeffen
left a comment
There was a problem hiding this comment.
This reminds me how much I hate the order table data structure with their variable item lengths. Gah 😄
duncanspumpkin
approved these changes
Nov 10, 2025
Contributor
duncanspumpkin
left a comment
There was a problem hiding this comment.
All looks good. The assembly here was comparing the values back to front so I accidentally inverted things. (i've got no excuse for the delete order mistake though. Doh)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #3313