Fix #7481: Don't modify oil rig stations during removal #7544
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
|
I can't say anything about the overall safety or the import code, but I picked this fix and played the save in #7530 the whole evening yesterday, without any problems, as far as I noticed (though I admittedly did not focus on oil rigs). |
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.
I'm not sure if this approach is entirely safe. The DeleteOilRig function is called from two places, the Industry destructor, and in afterload. The afterload call is for cleaning up orphan oil rig stations without oil rig, sometimes left over in old saves. I don't have a save of that kind on hand to test, so I don't know if it's safe.
I'm also not completely sure that the new assert can't trigger under certain (broken) situations, if a player has somehow managed to join their station with an oil rig station.