Fixed mutable copy-from #3666
Merged
Fixed mutable copy-from #3666
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
olanti-p
approved these changes
Nov 14, 2023
Merged
via the queue into
cataclysmbnteam:upload
with commit Nov 14, 2023
4958b7d
13 of 17 checks passed
|
Did notice my old save throws this error when loading it (game still seems to run fine tho) Doesn't give any errors when creating a new world |
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.
Summary
SUMMARY: Bugfixes "Fixed mutable copy-from"
Purpose of change
Should fix #3665
On my system it cause segfaults, but it comes from same mod and same special. Must be a build difference.
And it kinda makes sense that it starts ranting about unresolvable joins, if
outward_joinsgot duplicated during second finalize.Describe the solution
Added some checks to clean old data on finalize, which is happens twice when special is copy-from'ed. And some more small adjustments to make it more copy-from proof.
Also, by the way, removed obsolete anthill check in mapgen.cpp. It's currently handled by json.
Describe alternatives you've considered
Rewriting copy-froms -_-
Testing
Start game with PKs_Rebalancing(it does copy-from Anthill) mod, spawn regular anthill. Before fix it used to segfault me, not anymore.
Additional context